diff --git a/scripts/update-theme.ts b/scripts/update-theme.ts
index fde7414..b7efca7 100755
--- a/scripts/update-theme.ts
+++ b/scripts/update-theme.ts
@@ -1,4 +1,6 @@
 import { execSync } from 'node:child_process'
+import fs from 'node:fs'
+import path from 'node:path'
 import process from 'node:process'
 
 // Check and set up the remote repository
@@ -25,6 +27,15 @@ try {
   }
 }
 catch (error) {
-  console.error('❌ Update failed:', error)
-  process.exit(1)
+  // Check if there's a merge conflict
+  const gitDir = execSync('git rev-parse --git-dir', { encoding: 'utf8' }).trim()
+  const mergeHeadPath = path.join(gitDir, 'MERGE_HEAD')
+
+  if (fs.existsSync(mergeHeadPath)) {
+    console.log('⚠️ Update fetched with merge conflicts. Please resolve manually')
+  }
+  else {
+    console.error('❌ Update failed:', error)
+    process.exit(1)
+  }
 }