first commit of first feature
second commit of first feature
Merge branch 'firstfeature'