b1 change
b1 commit
Merge branch 'branch1'

Conflicts:
	test1.txt