modify a.txt
update
Merge branch 'b1.0'

Conflicts:
	a.txt