first b commit
Merge branch 'B' into A

Conflicts:
	file