b1 c1
b1 c2
b1 c3
Merge branch 'testbranch1'

Conflicts:
	test.txt