Added something at line 2
Merge remote-tracking branch 'origin'
moar changes
Resolved conflict for local file
Merge branch 'master' of https://github.com/ralampay/mysong
changes
merged from remote