Make conflict_of synced property

app/assets/javascripts/app/controllers/notes.js

@@ -255,7 +255,7 @@ angular.module('app')
         })
       }
 
-      if(note.conflict_of) {
+      if(note.content.conflict_of) {
         flags.push({
           text: "Conflicted Copy",
           class: "danger"
@@ -327,7 +327,11 @@ angular.module('app')
       let run = () => {
         $timeout(() => {
           this.selectedNote = note;
-          note.conflict_of = null; // clear conflict
+          if(note.content.conflict_of) {
+            note.content.conflict_of = null; // clear conflict
+            note.setDirty(true, true);
+            syncManager.sync();
+          }
           this.selectionMade()(note);
           this.selectedIndex = Math.max(this.visibleNotes().indexOf(note), 0);
 

app/assets/javascripts/app/controllers/tags.js

@@ -107,7 +107,11 @@ angular.module('app')
         });
       }
       this.selectedTag = tag;
-      tag.conflict_of = null; // clear conflict
+      if(tag.content.conflict_of) {
+        tag.content.conflict_of = null; // clear conflict
+        tag.setDirty(true, true);
+        syncManager.sync();
+      }
       this.selectionMade()(tag);
     }
 

app/assets/javascripts/app/directives/views/editorMenu.js

@@ -25,7 +25,11 @@ class EditorMenu {
 
     $scope.selectComponent = function(component) {
       if(component) {
-        component.conflict_of = null; // clear conflict if applicable
+        if(component.content.conflict_of) {
+          component.content.conflict_of = null; // clear conflict if applicable
+          component.setDirty(true, true);
+          syncManager.sync();
+        }
       }
       $timeout(() => {
         $scope.callback()(component);

app/assets/templates/directives/editor-menu.html.haml

@@ -9,8 +9,8 @@
       "circle" => "selectedEditor === editor && 'success'",
        "has-button" => "selectedEditor == editor || defaultEditor == editor", "button-text" => "defaultEditor == editor ? 'Undefault' : 'Set Default'",
        "button-action" => "toggleDefaultForEditor(editor)", "button-class" => "defaultEditor == editor ? 'warning' : 'info'"}
-        .sk-menu-panel-column{"ng-if" => "component.conflict_of || shouldDisplayRunningLocallyLabel(editor)"}
-          %strong.danger.medium-text{"ng-if" => "editor.conflict_of"} Conflicted copy
+        .sk-menu-panel-column{"ng-if" => "component.content.conflict_of || shouldDisplayRunningLocallyLabel(editor)"}
+          %strong.danger.medium-text{"ng-if" => "editor.content.conflict_of"} Conflicted copy
           .sk-sublabel{"ng-if" => "shouldDisplayRunningLocallyLabel(editor)"} Running Locally
 
       %a.no-decoration{"ng-if" => "editors.length == 0", "href" => "https://standardnotes.org/extensions", "target" => "blank"}

app/assets/templates/tags.html.haml

@@ -30,7 +30,7 @@
             "ng-change" => "ctrl.tagTitleDidChange(tag)", "ng-blur" => "ctrl.saveTag($event, tag)", "spellcheck" => "false"}
             .count {{tag.cachedNoteCount}}
 
-          .red.small-text.bold{"ng-show" => "tag.conflict_of"} Conflicted copy
+          .red.small-text.bold{"ng-show" => "tag.content.conflict_of"} Conflicted copy
           .red.small-text.bold{"ng-show" => "tag.errorDecrypting"} Unable to Decrypt
 
           .menu{"ng-show" => "ctrl.selectedTag == tag"}