change the merge error