samename test c.txt
Merge branch 'B1'

Conflicts:
	c.txt