From f46367d77bcb20b563d80ce65c5da0c6596edf8c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 12 Oct 2020 11:20:44 +0100
Subject: [PATCH] Fix import of merged flow

---
 packages/node_modules/@node-red/editor-client/src/js/nodes.js   | 2 ++
 packages/node_modules/@node-red/editor-client/src/js/ui/diff.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index ca896ff63..af83e2d53 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -1842,6 +1842,8 @@ RED.nodes = (function() {
         });
         defaultWorkspace = null;
         initialLoad = null;
+        workspaces = {};
+
         RED.nodes.dirty(false);
         RED.view.redraw(true, true);
         RED.palette.refresh();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
index 13a157e21..a039e0172 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -1411,7 +1411,7 @@ RED.diff = (function() {
         // Restore the original flow so subsequent merge resolutions can properly
         // identify new-vs-old
         RED.nodes.originalFlow(originalFlow);
-        imported[0].forEach(function(n) {
+        imported.nodes.forEach(function(n) {
             if (nodeChangedStates[n.id] || localChangedStates[n.id]) {
                 n.changed = true;
             }