init feature commit
feature 1 chg 1
feature 1 - chg 2
merge feature 1 into master