new file for the feature is added here
modified file2 here:
Merge branch 'feature1'