+1 line somewhere else
Merging remote-tracking branch 'origin/master'