Fixed merge conflicts

frontend/package.json

@@ -1,10 +1,9 @@
 {
   "name": "shuffler",
   "homepage": "https://shuffler.io",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.15.8",
     "@codemirror/commands": "^6.2.2",
     "@emotion/is-prop-valid": "^1.1.1",
     "@emotion/react": "^11.7.0",
@@ -23,7 +22,6 @@
     "@uiw/react-codemirror": "^3.2.1",
     "@use-it/interval": "^1.0.0",
     "algoliasearch": "^4.13.1",
-    "babel-eslint": "^10.1.0",
     "class-transformer": "^0.4.0",
     "create-react-app": "^4.0.3",
     "cytoscape": "^3.15.1",
@@ -79,14 +77,12 @@
     "shellwords": "^0.1.1",
     "simplebar": "^4.2.3",
     "styled-components": "^4.4.0",
-    "webpack": "^4.44.2",
-    "websocket": "^1.0.30",
     "yaml": "^1.7.2",
     "yamljs": "^0.3.0",
     "zone.js": "~0.11.4"
   },
   "scripts": {
-    "start": "PORT=3000 react-scripts start",
+    "start": "HTTPS=false&&PORT=3000 react-scripts --openssl-legacy-provider start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
@@ -110,5 +106,9 @@
   "devDependencies": {
     "prettier": "2.4.1",
     "promise-window": "^1.2.1"
+    "@babel/core": "^7.15.8",
+    "babel-eslint": "^10.1.0",
+    "webpack": "^4.44.2",
+	"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
   }
 }