Trying this branch again...
Made a change to foo.txt which shouldn't conflict.
Final change to bar.txt
Trying this branch again...
Made a change to foo.txt which shouldn't conflict.
Final change to bar.txt
Merge branch 'bar-branch' of github.com:mkazin/merge_testing into bar-branch

Conflicts:
	foo.txt