edit featureC
merge featureC