feature 1 added
feature 1 compatibility added
all the changes for feature 1 merged 'feature1'