fixed conflict in commit

fixed syn_headphonenoise_fft conflict, still need to fix scaling issu
(see gerbil_working branch for that!)