add featureC
Merge FeatureC and modified FeatureA and B