b2 - adding conflict.txt
Merge branch 'b2' into b1

Conflicts:
	conflict.txt