alter file b2 in branch b2
Merge branch 'b2' into b1

Conflicts:
	b2.txt