Fix the errors caused by merge conflicts.