c.txt created from master
Merge branch 'B1'

Conflicts:
	c.txt