added feature 1
feature 2
added additional features to feature2
merge
added fix1