edit FeatureC
conflic featherB and featherC