Removed a new line. I'm a hero.
Merge remote-tracking branch 'origin/master'