Trying a thing that checks for newline
Merge remote-tracking branch 'origin/master'