add FeatureC
merge from featherB
edit FeatureC
conflic featherB and featherC
merge FeatureBand C
edit V.2 merge FeatureBand C
Edit FeatureB