Added new music files
Fixed merge conflict