diff --git a/package-lock.json b/package-lock.json
index 48541e825..d80d2ac31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,8 +16,8 @@
 				"@mui/lab": "6.0.0-beta.28",
 				"@mui/material": "6.4.5",
 				"@mui/x-charts": "^7.5.1",
-				"@mui/x-data-grid": "7.27.0",
-				"@mui/x-date-pickers": "7.27.0",
+				"@mui/x-data-grid": "7.27.1",
+				"@mui/x-date-pickers": "7.27.1",
 				"@reduxjs/toolkit": "2.6.0",
 				"@solana/wallet-adapter-base": "0.9.23",
 				"@solana/wallet-adapter-material-ui": "0.16.34",
@@ -47,10 +47,6 @@
 				"react-toastify": "^10.0.5",
 				"recharts": "2.15.1",
 				"redux-persist": "6.0.0",
-<<<<<<< HEAD
-=======
-				"swiper": "11.2.4",
->>>>>>> prism/develop
 				"vite-plugin-svgr": "^4.2.0"
 			},
 			"devDependencies": {
@@ -3862,9 +3858,9 @@
 			}
 		},
 		"node_modules/@mui/x-data-grid": {
-			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.27.0.tgz",
-			"integrity": "sha512-RZPtAGCDF3H7+9HqSxPE+0xMtTrI9T9CRwSWiCAwrVSYUzgM4S8aQXaX1mvHgBTW9PCR0LYsFoGJWwuRRGPE/g==",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.27.1.tgz",
+			"integrity": "sha512-dDgrCIiIcb3XPxUVxXQsk9yjXFSAXBunqW1m1jjcr0D3jj3qHibBtGslSKnBmmcoT6XLAXdbZOu1fFC+xYhyGA==",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.25.7",
@@ -3900,9 +3896,9 @@
 			}
 		},
 		"node_modules/@mui/x-date-pickers": {
-			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.27.0.tgz",
-			"integrity": "sha512-wSx8JGk4WQ2hTObfQITc+zlmUKNleQYoH1hGocaQlpWpo1HhauDtcQfX6sDN0J0dPT2eeyxDWGj4uJmiSfQKcw==",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.27.1.tgz",
+			"integrity": "sha512-2YPhTM9TM39dmIkEQdSB6P6NASePB9LuhXXKQqq0PX4FXGymYEPz/acQXkk617zwfxJJaDhJZ6g8SAv5pklTJQ==",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.25.7",
diff --git a/package.json b/package.json
index 322ec8a8c..8d05e446b 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,8 @@
 		"@fontsource/roboto": "^5.0.13",
 		"@hello-pangea/dnd": "^18.0.0",
 		"@mui/x-charts": "^7.5.1",
-		"@mui/x-data-grid": "7.27.0",
-		"@mui/x-date-pickers": "7.27.0",
+		"@mui/x-data-grid": "7.27.1",
+		"@mui/x-date-pickers": "7.27.1",
 		"@mui/icons-material": "6.4.5",
 		"@mui/lab": "6.0.0-beta.28",
 		"@mui/material": "6.4.5",