Add B
Add C
Merge branch 'b1'

Conflicts:
	abc