branch B
abcdefg
test
test2
Merge branch 'test_branch_B'

Conflicts:
	abcdefg.html
no message