b1 update
b2 update
Merge branch 'b2'

Conflicts:
	feature1.txt