add file another-feature as feature
Merge branch 'another-feature' into dev