init
f1 mod
text added
deleted text in feature2 branch
mary-mary
another line in f1 branch
bwa f3
!!!
Merge branch 'feature2' into HEAD

Conflicts:
	a.txt
Merge branch 'ubranch'

Conflicts:
	a.txt
Merge branch 'feature1'

Conflicts:
	a.txt
fixes
Merge remote-tracking branch 'github/master'