Added more lyrics on the remote/song
Generating a conflict
Merged song
Added the mountain