Added basic rollback + redo. Advanced merging is missing (but no other plugin has this, anyway, so....)