Added feature1
Added feature2
Added additional features to feature 2
Merged featur1
Added feature3
FIX1
fix2
FIX1
merged?