third commit
another commit
Merge branch 'new-feature' into another-feature