New db
Stashing
User edits without rollback
Fixed merge problems