Correct merge error.