feature1-1 + commit1
feature1-1 + commit 2
Merge branch 'feature/feature1-1'
hotfix1 + commit 1
hotfix1 + commit 2
Merge branch 'hotfix/hotfix1'

Conflicts:
	gitflowcommits.txt