correct a merge error.