bar (added in branch test)
baz (from branch test)
baz (added in master)
Merge branch 'test'

Conflicts:
	baz.txt