Figuring out undo redo stuff
trying to merge...
Trying to commit merged changes...