Branch1 commit 1
master commit after branch 1
Branch2 commit 1
Merge branch 'branch1'

Conflicts:
	README.md