fix: resolve merge conflicts with upstream/main

Author: pglavin2

next.config.ts

@@ -68,19 +68,7 @@ const nextConfig: NextConfig = {
         destination: "https://app.gitcoin.co/blog",
       },
 
-      // redo
-      {
-        source: "/brand",
-        destination: "https://app.gitcoin.co/brand",
-      },
-
       // impact.gitcoin.co rewrites
-
-      // redo - high priority
-      {
-        source: "/impact",
-        destination: "https://impact.gitcoin.co",
-      },
       {
         source: "/impact/:path*",
         destination: "https://impact.gitcoin.co/impact/:path*",

package-lock.json

@@ -62,6 +62,7 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
+    "@types/three": "^0.183.1",
     "playwright": "^1.58.2",
     "shadcn": "^3.8.4",
     "tsx": "^4.21.0",