remove merge error