diff --git a/modules/actions/merge_remote_changes.js b/modules/actions/merge_remote_changes.js
index 07b76facb..ee4d1d143 100644
--- a/modules/actions/merge_remote_changes.js
+++ b/modules/actions/merge_remote_changes.js
@@ -49,7 +49,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
         var a = target.nodes || [];
         var b = remote.nodes || [];
         var nodes = [];
-        var hunks = diff3Merge(a, o, b, true);
+        var hunks = diff3Merge(a, o, b, { excludeFalseConflicts: true });
 
         for (var i = 0; i < hunks.length; i++) {
             var hunk = hunks[i];
diff --git a/package.json b/package.json
index 6bf756e86..f8f895d13 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "lodash-es": "~4.17.15",
     "marked": "0.8.0",
     "martinez-polygon-clipping": "0.6.2",
-    "node-diff3": "1.0.0",
+    "node-diff3": "2.0.1",
     "osm-auth": "1.0.2",
     "pannellum": "2.5.6",
     "rbush": "3.0.1",