feature1 done
bugfix1 change
feature1 done
Merge branch 'feature1'

Conflicts:
	a.txt
changes made in bugfix2 branch