Correct merge errors.