remove the merge error