Fix merge conflicts

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "flowise-ui",
-    "version": "1.4.1",
+    "version": "1.6.0",
     "license": "SEE LICENSE IN LICENSE.md",
     "homepage": "https://flowiseai.com",
     "author": {
@@ -8,14 +8,20 @@
         "email": "henryheng@flowiseai.com"
     },
     "dependencies": {
+        "@codemirror/lang-javascript": "^6.2.1",
+        "@codemirror/lang-json": "^6.0.1",
+        "@codemirror/view": "^6.22.3",
         "@emotion/cache": "^11.4.0",
         "@emotion/react": "^11.10.6",
         "@emotion/styled": "^11.10.6",
-        "@mui/icons-material": "^5.0.3",
-        "@mui/material": "^5.11.12",
-        "@mui/x-data-grid": "^6.8.0",
+        "@mui/icons-material": "5.0.3",
+        "@mui/lab": "5.0.0-alpha.156",
+        "@mui/material": "5.15.0",
+        "@mui/x-data-grid": "6.8.0",
         "@tabler/icons": "^1.39.1",
-        "@vitejs/plugin-react": "^4.2.0",
+        "@uiw/codemirror-theme-sublime": "^4.21.21",
+        "@uiw/codemirror-theme-vscode": "^4.21.21",
+        "@uiw/react-codemirror": "^4.21.21",
         "axios": "^0.27.2",
         "clsx": "^1.1.1",
         "dotenv": "^16.0.0",
@@ -29,8 +35,6 @@
         "lodash": "^4.17.21",
         "moment": "^2.29.3",
         "notistack": "^2.0.4",
-        "openai": "^4.20.0",
-        "prismjs": "^1.28.0",
         "prop-types": "^15.7.2",
         "react": "^18.2.0",
         "react-code-blocks": "^0.0.9-0",
@@ -43,7 +47,6 @@
         "react-redux": "^8.0.5",
         "react-router": "~6.3.0",
         "react-router-dom": "~6.3.0",
-        "react-simple-code-editor": "^0.11.2",
         "react-syntax-highlighter": "^15.5.0",
         "reactflow": "^11.5.6",
         "redux": "^4.0.5",
@@ -53,9 +56,6 @@
         "remark-math": "^5.1.1",
         "socket.io-client": "^4.6.1",
         "uuid": "^9.0.1",
-        "vite": "^5.0.2",
-        "vite-plugin-pwa": "^0.17.0",
-        "vite-plugin-react-js-support": "^1.0.7",
         "yup": "^0.32.9"
     },
     "scripts": {
@@ -87,10 +87,14 @@
         "@testing-library/jest-dom": "^5.11.10",
         "@testing-library/react": "^14.0.0",
         "@testing-library/user-event": "^12.8.3",
+        "@vitejs/plugin-react": "^4.2.0",
         "pretty-quick": "^3.1.3",
         "react-scripts": "^5.0.1",
         "rimraf": "^5.0.5",
         "sass": "^1.42.1",
-        "typescript": "^4.8.4"
+        "typescript": "^4.8.4",
+        "vite": "^5.0.2",
+        "vite-plugin-pwa": "^0.17.0",
+        "vite-plugin-react-js-support": "^1.0.7"
     }
 }