Commit
B1 changed after B3 merged
Merge branch 'B1'

Conflicts:
	First File.txt