commit 1, branch 1
commit 2, branch 1
commit 3, branch 1
commit 4, branch 1
Merge branch 'branch1'

Conflicts:
	testfolder/reblah.txt