feature1
Merge branch 'feature-1' into develop
Merge branch 'feature2' into develop

Conflicts:
hello