Fix SoundManager.cpp merge conflict