fixed merge
line 6 of song - revised
line 8 - revised 2