develop 4
develop 5
feature 3
develop 6
Merge branch 'feature' into develop

Conflicts:
	file1.h
develop 7
develop 8
feature 4
Merge branch 'feature'

Conflicts:
	file1.h
Merge branch 'develop'