foo -> bar *3
Merge branch 'master' into bar

Conflicts:
	foo.txt
choose both left first