feature 1
develop 1
develop 1
develop 3
feature 2
Merge branch 'feature' into develop

Conflicts:
	file1.h