solve conflicts

10 jobs for flip_fft in 30 minutes and 8 seconds (queued for 1 second)