Safe blanket to clean DB if wrong conflicts keep stored

src/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -263,7 +263,11 @@ public class SynchronizeFileOperation extends SyncOperation {
                     result = new RemoteOperationResult(ResultCode.OK);
                 }
 
-            } 
+                // safe blanket: sync'ing a not in-conflict file will clean wrong conflict markers in ancestors
+                if (result.getCode() != ResultCode.SYNC_CONFLICT) {
+                    getStorageManager().saveConflict(mLocalFile, false);
+                }
+            }
 
         }