line 2
Merge remote-tracking branch 'remotes/origin/master'

Not sure what is being merged