added sounds
solve merge conflicts