develop: 1
feature1: 1
Merge branch 'feature1'

Conflicts:
	file1.txt
develop: 1
develop: 2
feature 1
develop 1
develop 1
develop 3
feature 2
Merge branch 'feature' into develop

Conflicts:
	file1.h
Merge branch 'develop'