another new commit
Merge branch 'feature/new-feature' into develop
Merge branch 'develop' into release