add b.txt
force update
Merge branch 'feature1'

Conflicts:
	a.txt