add create it in b1
add a commit in branch b2
Merge branch 'b1'

Conflicts:
	1.txt
add a new file