I might have to revert a lot of this

package.json.old

@@ -3,6 +3,7 @@
   "type": "module",
   "version": "0.0.1",
   "scripts": {
+<<<<<<< HEAD
     "dev:server": "tsx --watch server",
     "dev:client": "astro dev",
     "dev": "npm run dev:client",
@@ -34,6 +35,41 @@
       "sharp",
       "utf-8-validate"
     ]
+=======
+    "dev": "node server.mjs",
+    "build": "next build --turbopack",
+    "start": "NODE_ENV=production node server.mjs"
+  },
+  "dependencies": {
+    "@hookform/resolvers": "^3.9.0",
+    "@radix-ui/react-dialog": "^1.1.2",
+    "@radix-ui/react-dropdown-menu": "^2.1.2",
+    "@radix-ui/react-label": "^2.1.0",
+    "@radix-ui/react-select": "^2.1.2",
+    "@radix-ui/react-separator": "^1.1.0",
+    "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-tabs": "^1.1.1",
+    "@radix-ui/react-toast": "^1.2.2",
+    "@radix-ui/react-tooltip": "^1.1.3",
+    "@tomphttp/bare-server-node": "^2.0.4",
+    "chemicaljs": "^2.1.1",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.1",
+    "framer-motion": "^11.11.8",
+    "lucide-react": "^0.452.0",
+    "mini-svg-data-uri": "^1.4.4",
+    "next": "15.3.1",
+    "next-themes": "^0.3.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-hook-form": "^7.53.0",
+    "react-router-dom": "^6.27.0",
+    "sonner": "^1.5.0",
+    "store2": "^2.14.3",
+    "tailwind-merge": "^2.5.3",
+    "tailwindcss-animate": "^1.0.7",
+    "zod": "^3.23.8"
+>>>>>>> main
   },
   "devDependencies": {
     "@iconify-json/lucide": "^1.2.30",

tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "extends": "astro/tsconfigs/strict",
-  "include": [".astro/types.d.ts", "**/*"],
-  "exclude": ["dist", "server"],
-  "compilerOptions": {
-    "moduleResolution": "bundler",
-    "baseUrl": ".",
-    "paths": {
-        "@components/*": ["src/components/*"],
-        "@layouts/*": ["src/layouts/*"],
-        "@utils/*": ["src/utils/*"],
-        "@assets/*": ["src/assets/*"],
-        "@styles/*": ["src/styles/*"]
-    }
-  }
-}

tsconfig.json.old

@@ -0,0 +1,48 @@
+{
+  "extends": "astro/tsconfigs/strict",
+  "include": [".astro/types.d.ts", "**/*"],
+  "exclude": ["dist", "server"],
+  "compilerOptions": {
+<<<<<<< HEAD
+=======
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+>>>>>>> main
+    "moduleResolution": "bundler",
+    "baseUrl": ".",
+    "paths": {
+<<<<<<< HEAD
+        "@components/*": ["src/components/*"],
+        "@layouts/*": ["src/layouts/*"],
+        "@utils/*": ["src/utils/*"],
+        "@assets/*": ["src/assets/*"],
+        "@styles/*": ["src/styles/*"]
+    }
+  }
+=======
+      "@/*": [
+        "./src/*"
+      ]
+    },
+    "target": "ES2017"
+  },
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+>>>>>>> main
+}