Added some lyrics.
Resolved conflicts