adding another commit
...
addinga nother feature
..
Merge branch 'another-feature' into staging