manual (meld) merge from audio_extraction branch