feature 1 commit a
feature 1 commit b
Merge branch 'feature1'