Merge in feature branch only
Merge branch 'feature1' into develop