From ca47d2662d557c47b8d68b998fd0b4bbc221c24d Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Thu, 18 Jun 2015 11:48:49 -0400
Subject: [PATCH] Let conflict resolution restore deleted childnodes if
 force_local

---
 js/id/actions/merge_remote_changes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/id/actions/merge_remote_changes.js b/js/id/actions/merge_remote_changes.js
index ff04a3f29..9b055b976 100644
--- a/js/id/actions/merge_remote_changes.js
+++ b/js/id/actions/merge_remote_changes.js
@@ -95,7 +95,7 @@ iD.actions.MergeRemoteChanges = function(id, localGraph, remoteGraph, formatUser
 
             } else if (option === 'force_local' && local) {
                 target = iD.Entity(local);
-                if (remote && remote.visible) {
+                if (remote) {
                     target = target.update({ version: remote.version });
                 }
                 updates.replacements.push(target);