Resolve conflicts after pull (keep origin/main)

next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

next.config.mjs

@@ -1,20 +1,5 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  // Turbopack configuration (Next.js 16+)
-  turbopack: {
-    resolveAlias: {
-      buffer: 'buffer/',
-      stream: 'stream-browserify',
-      util: 'util/',
-    },
-  },
-  
-  // Allow cross-origin requests from the reverse proxy domain
-  allowedDevOrigins: [
-    'hub.slm-lab.net',
-    'https://hub.slm-lab.net',
-  ],
-  
   eslint: {
     ignoreDuringBuilds: true,
   },
@@ -24,6 +9,12 @@ const nextConfig = {
   images: {
     unoptimized: true,
   },
+  experimental: {
+    webpackBuildWorker: true,
+    parallelServerBuildTraces: true,
+    parallelServerCompiles: true,
+  },
+  turbopack: {},
   async headers() {
     return [
       {