fix conflicts

package.json

@@ -12,8 +12,8 @@
     "format": "prettier --write ."
   },
   "dependencies": {
-    "@apollo/client": "^3.8.8",
-    "@emotion/react": "^11.11.1",
+    "@apollo/client": "^3.9.5",
+    "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.0",
     "@github/time-elements": "^4.0.0",
     "@hackclub/icons": "^0.0.14",
@@ -21,32 +21,27 @@
     "@hackclub/meta": "1.1.32",
     "@hackclub/theme": "^0.3.3",
     "@mdx-js/loader": "^1.6.22",
-    "@next/mdx": "^14.0.3",
+    "@next/mdx": "^14.1.0",
     "@octokit/auth-app": "^6.0.1",
-    "@octokit/core": "^5.0.1",
+    "@octokit/core": "^5.1.0",
     "@octokit/rest": "^20.0.2",
-    "@sendgrid/mail": "^8.1.1",
-    "@vercel/kv": "^1.0.1",
-    "@vercel/postgres": "^0.5.1",
     "add": "^2.0.6",
     "airtable-plus": "^1.0.4",
     "animated-value": "^0.2.4",
     "animejs": "^3.2.2",
-    "axios": "^1.6.2",
+    "axios": "^1.6.7",
     "cookies-next": "^4.0.0",
     "country-list": "^2.3.0",
     "country-list-js": "^3.1.8",
-    "cursor-effects": "^1.0.12",
+    "cursor-effects": "^1.0.15",
     "date-fns": "^2.30.0",
     "devtools-detect": "^4.0.1",
     "form-data": "^4.0.0",
-    "framer-motion": "^10.16.16",
     "fuzzysort": "^2.0.4",
     "geopattern": "^1.2.3",
     "globby": "^11.0.4",
     "graphql": "^16.8.1",
-    "gsap": "^3.12.4",
-    "js-confetti": "^0.11.0",
+    "js-confetti": "^0.12.0",
     "lodash": "^4.17.21",
     "million": "^2.6.4",
     "next": "^12.3.1",
@@ -55,24 +50,21 @@
     "react-before-after-slider-component": "^1.1.8",
     "react-datepicker": "^4.24.0",
     "react-dom": "^17.0.2",
-    "react-horizontal-scrolling-menu": "^4.1.2",
     "react-konami-code": "^2.3.0",
     "react-marquee-slider": "^1.1.5",
     "react-masonry-css": "^1.0.16",
     "react-page-visibility": "^7.0.0",
     "react-relative-time": "^0.0.9",
-    "react-responsive-carousel": "^3.2.23",
     "react-reveal": "^1.2.2",
     "react-scrolllock": "^5.0.1",
-    "react-slick": "^0.29.0",
     "react-snowfall": "^1.2.1",
     "react-ticker": "^1.3.2",
     "react-tooltip": "^4.5.1",
     "react-tsparticles": "^2.12.2",
-    "react-use-websocket": "^4.5.0",
+    "react-use-websocket": "^4.7.0",
     "react-wrap-balancer": "^1.1.0",
-    "recharts": "2.1.12",
-    "styled-components": "^6.1.1",
+    "recharts": "2.12.2",
+    "styled-components": "^6.1.8",
     "swr": "^2.2.4",
     "theme-ui": "^0.14",
     "tinytime": "^0.2.6",
@@ -81,8 +73,8 @@
     "yarn": "^1.22.21"
   },
   "devDependencies": {
-    "eslint": "8.55.0",
-    "eslint-config-next": "14.0.3",
-    "prettier": "^3.2.2"
+    "eslint": "8.57.0",
+    "eslint-config-next": "14.1.0",
+    "prettier": "^3.2.5"
   }
 }