develop
develop
hf3
feature2
develop
feature2
Merge branch 'feature/feature2' into develop

Conflicts:
	f1.txt
develop
Merge branch 'master' into develop

Conflicts:
	f1.txt