fixed the merge conflict

comm audio merge conflicts!