commiting FOO to "new" branch
Test
Added a new line
same line
same line
Merge branch 'new'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md