updat b to a
Merge branch 'test'

Conflicts:
	a.txt