New file
Merge remote-tracking branch 'origin'

Conflicts:
	foo.txt