using flag --no-ff for merging
Merge branch 'new_feature'