new flowboxes (noise /bandpass)
conflict resolve

resolve
*) Fix merge conflict in project file