Undo botched merge.