first
Merge branch 'origin/foo'

Conflicts:
	foo.txt