added file1 to foo
Merge branch 'foo'

Conflicts:
	file1