add a feature on a new branch feature
Merge branch 'feature'