merge from featherB
conflic featherB and featherC
add featureA
edit merge FeatureB