diff --git a/gitnexus/scripts/build.js b/gitnexus/scripts/build.js
index 6de4ff5c0..3cd672b2b 100644
--- a/gitnexus/scripts/build.js
+++ b/gitnexus/scripts/build.js
@@ -33,11 +33,23 @@ function compileTypeScriptProject(projectRoot) {
 
 // ── 1. Build gitnexus-shared ───────────────────────────────────────
 console.log('[build] compiling gitnexus-shared…');
+<<<<<<< HEAD
 compileTypeScriptProject(SHARED_ROOT);
 
 // ── 2. Build gitnexus ──────────────────────────────────────────────
 console.log('[build] compiling gitnexus…');
 compileTypeScriptProject(ROOT);
+=======
+const tscCmd =
+  process.platform === 'win32'
+    ? path.join('node_modules', '.bin', 'tsc.cmd')
+    : path.join('node_modules', '.bin', 'tsc');
+execSync(tscCmd, { cwd: SHARED_ROOT, stdio: 'inherit', timeout: 120_000 });
+
+// ── 2. Build gitnexus ──────────────────────────────────────────────
+console.log('[build] compiling gitnexus…');
+execSync(tscCmd, { cwd: ROOT, stdio: 'inherit', timeout: 120_000 });
+>>>>>>> 9e23c80cabe33571be0c3a9418dba269668e717a
 
 // ── 3. Copy shared dist ────────────────────────────────────────────
 console.log('[build] copying shared module into dist/_shared…');