diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 68fde1c..35ce7ca 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -12,14 +12,9 @@
         "@emotion/styled": "^11.11.0",
         "@material-ui/core": "^4.12.4",
         "@material-ui/icons": "^4.11.3",
-<<<<<<< HEAD
         "@mui/icons-material": "^5.15.15",
-        "@mui/material": "^5.13.1",
-=======
-        "@mui/icons-material": "^5.11.16",
         "@mui/material": "^5.15.15",
->>>>>>> c1a5c44 (fix: upgrade @mui/material from 5.15.7 to 5.15.15)
-        "@mui/styles": "^5.13.1",
+        "@mui/styles": "^5.15.15",
         "@rjsf/core": "^5.12.1",
         "@rjsf/material-ui": "^5.7.2",
         "@rjsf/utils": "^5.7.2",
@@ -1619,17 +1614,17 @@
       }
     },
     "node_modules/@mui/styles": {
-      "version": "5.15.7",
-      "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.15.7.tgz",
-      "integrity": "sha512-3F/ZIPyVLz5mlc6fZRSdfj8i3JBn+lPrXikFJ5NlK2n23cXZSEYe14hpbYRCflxumPNnvSjkYnGc/RvBgb5ZAQ==",
+      "version": "5.15.15",
+      "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.15.15.tgz",
+      "integrity": "sha512-KBklDHNEddodEjcnZ+/3ieVcp+Mb/pzdQzAagUpt4RDd9m/mn+2JkqJh2rnrWUwS//YLsbL3IbUrONYn5yPxfQ==",
       "dependencies": {
         "@babel/runtime": "^7.23.9",
         "@emotion/hash": "^0.9.1",
-        "@mui/private-theming": "^5.15.7",
-        "@mui/types": "^7.2.13",
-        "@mui/utils": "^5.15.7",
+        "@mui/private-theming": "^5.15.14",
+        "@mui/types": "^7.2.14",
+        "@mui/utils": "^5.15.14",
         "clsx": "^2.1.0",
-        "csstype": "^3.1.2",
+        "csstype": "^3.1.3",
         "hoist-non-react-statics": "^3.3.2",
         "jss": "^10.10.0",
         "jss-plugin-camel-case": "^10.10.0",
diff --git a/frontend/package.json b/frontend/package.json
index dd131a3..1bbf4d6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -17,7 +17,7 @@
     "@material-ui/icons": "^4.11.3",
     "@mui/icons-material": "^5.15.15",
     "@mui/material": "^5.15.15",
-    "@mui/styles": "^5.13.1",
+    "@mui/styles": "^5.15.15",
     "@rjsf/core": "^5.12.1",
     "@rjsf/material-ui": "^5.7.2",
     "@rjsf/utils": "^5.7.2",