Add a new line, to test Git
Merge remote-tracking branch 'origin/master'