Fix merge mistakes.