feat: solved git conflicts

package.json

@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.8.1",
-    "@mui/icons-material": "^5.5.1",
-    "@mui/material": "^5.14.7",
-    "@mui/styled-engine-sc": "^5.4.2",
-    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@emotion/styled": "^11.11.0",
+    "@mui/icons-material": "^5.14.8",
+    "@mui/material": "^5.14.8",
+    "@mui/styled-engine-sc": "^5.14.8",
+    "@rollup/plugin-node-resolve": "^15.2.1",
     "@types/styled-components": "^5.1.24",
     "firebase": "^9.6.8",
     "lint-staged": "^14.0.1",
@@ -50,7 +50,7 @@
     "husky": "^8.0.0",
     "postcss": "^8.4.28",
     "prettier": "^3.0.3",
-    "tailwindcss": "^3.0.23",
+    "tailwindcss": "^3.3.3",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",
     "vite": "^4.4.9"