edit on branch B
Merge branch 'editB' into merge

Conflicts:
	file.txt