Added sound effects
Ran into conflict but just took --theirs