test commit
ccccc commit
Merge branch 'test'
ccc commit
dddd commit
Merge branch 'test'

Conflicts:
	test.txt
commit test2
commit4
commit1

commit2

commit3