remove some merge markup