Change
Merge branch 'new_feature'
Update with feature