2
Merge branch 'master' into b1

Conflicts:
	a.txt