Corrects merge mistakes.