undo/redo button fix
merge conflight