xx1
feature1 sub
master 1
Merge branch 'feature1'
f2
m2
Merge branch 'feature1'

Conflicts:
	a.txt