file b2 changed in branch b1
change file b2.txt in branch b2
Merge branch 'b2' into b1

Conflicts:
	b2.txt