SoundSystem: minor fixes to SoundHandler.cpp
Fixing conflicts