From a3d0030104abfd6970e100a7ab05db58d015d370 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Tue, 18 Jul 2023 12:42:37 +0300
Subject: [PATCH] fix: fix merge issue

---
 packages/design-system/src/components/N8nMenu/Menu.vue     | 2 +-
 .../editor-ui/src/components/SourceControlPullModal.ee.vue | 2 +-
 packages/editor-ui/src/views/NodeView.vue                  | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/design-system/src/components/N8nMenu/Menu.vue b/packages/design-system/src/components/N8nMenu/Menu.vue
index a4c99e8884..7a429f6fd3 100644
--- a/packages/design-system/src/components/N8nMenu/Menu.vue
+++ b/packages/design-system/src/components/N8nMenu/Menu.vue
@@ -97,7 +97,7 @@ export default defineComponent({
 			default: (): IMenuItem[] => [],
 		},
 		modelValue: {
-			type: String,
+			type: [String, Boolean],
 			default: '',
 		},
 	},
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
index bc58765f8c..1885a8b86d 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -7,7 +7,7 @@ import type { SourceControlStatus } from '@/Interface';
 import { useI18n, useLoadingService, useToast } from '@/composables';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores';
-import { useRoute } from 'vue-router/composables';
+import { useRoute } from 'vue-router';
 
 const props = defineProps({
 	data: {
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 7ae8193e84..db395397b4 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -96,13 +96,6 @@
 			/>
 			<Suspense>
 				<NodeCreation
-					v-if="!isReadOnly && !readOnlyEnv"
-					:create-node-active="createNodeActive"
-					:node-view-scale="nodeViewScale"
-					@toggleNodeCreator="onToggleNodeCreator"
-					@addNode="onAddNode"
-				/>
-				<node-creation
 					v-if="!isReadOnlyRoute && !readOnlyEnv"
 					:create-node-active="createNodeActive"
 					:node-view-scale="nodeViewScale"