merge error