edit feature1
feature2
Merge branch 'feature/f1' into develop