not a great message
Merge branch 'foo'

Conflicts:
	Foo.java