feature 1 change
feature 1 change 2
Merge branch 'feature1' into develop