fix merge conflict

Author: blopa

package-lock.json

@@ -58,7 +58,8 @@
     "react-scripts": "^4.0.3",
     "react-spring": "^9.3.2",
     "redux": "^4.1.2",
-    "redux-thunk": "^2.4.1"
+    "redux-thunk": "^2.4.1",
+    "socket.io-client": "^4.4.0"
   },
   "browserslist": {
     "production": [