bar changed
another bar change
bar change in master
bar changed in bar
Merge branch 'bar'

Conflicts:
	bar
foo changed in master