conflict 3
conflict 4
foo
foo
bar
Merge branch 'master' of github.com:mgsloan/testrepo

Conflicts:
	foo.txt