More bugfixes and style updates:

* working Previous/Next buttons
* remove behaviors from save mode
  (users should not be moving nodes around or selecting at this point)
* clear hover before hovering next object
* enable save button and finished message after reviewing last conflict
* store users choice in __data__.chosen..
* default choices to `keep remote version`
* better message for delete conflicts
* fix undelete action to check localGraph (which will have the entity)
  instead of context.graph() (which may not)

css/app.css

@@ -2504,15 +2504,6 @@ img.wiki-image {
     padding: 20px 20px 0 20px;
 }
 
-.conflict-container:not(.expanded) .conflict-description:hover {
-    background: #ececec;
-}
-
-.conflict-container.expanded {
-    padding: 10px 0;
-    background: #f6f6f6;
-}
-
 .conflict-detail-container {
     padding: 10px 20px;
 }

data/core.yaml

@@ -314,16 +314,17 @@ en:
     no_changes: No changes to save.
     error: Errors occurred while trying to save
     status_code: "Server returned status code {code}"
-    status_gone: '{name} has already been deleted.'
     unknown_error_details: "Please ensure you are connected to the internet."
     uploading: Uploading changes to OpenStreetMap.
     unsaved_changes: You have unsaved changes
     conflict:
       header: Resolve conflicting edits
       count: 'Conflict {num} of {total}'
-      message: '{name}'
+      previous: '< Previous'
+      next: 'Next >'
       keep_local: Keep mine
       keep_remote: Use theirs
+      deleted: 'This object has been deleted.'
       restore: Restore
       delete: Leave Deleted
       download_changes: Download your changes.

dist/locales/en.json

@@ -388,16 +388,17 @@
         "no_changes": "No changes to save.",
         "error": "Errors occurred while trying to save",
         "status_code": "Server returned status code {code}",
-        "status_gone": "{name} has already been deleted.",
         "unknown_error_details": "Please ensure you are connected to the internet.",
         "uploading": "Uploading changes to OpenStreetMap.",
         "unsaved_changes": "You have unsaved changes",
         "conflict": {
             "header": "Resolve conflicting edits",
             "count": "Conflict {num} of {total}",
-            "message": "{name}",
+            "previous": "< Previous",
+            "next": "Next >",
             "keep_local": "Keep mine",
             "keep_remote": "Use theirs",
+            "deleted": "This object has been deleted.",
             "restore": "Restore",
             "delete": "Leave Deleted",
             "download_changes": "Download your changes.",