merge error remove