undo fixes
merge