add sentence to b1
Merge branch 'b1'
commit b2
Merge branch 'b2'

Conflicts:
	branch 2 text file.txt