Fix sound?
Fixed conflicts