Fix undo after merge with node login