adding b.txt to feature1 branch
modifying a.txt in feature1
Merge branch 'feature1'

Conflicts:
	a.txt