commit1
commit 2
Merge branch 'foo_feature'

Conflicts:
	file1