conflict
Merge branch 'b1'

Conflicts:
	a.txt