delete and altered sounds
conflict issues

conflict fix