hopefully this will work
fix undo redo hopefully
merging stuff