diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index ec16447..6b3d6ec 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -8,7 +8,8 @@
       "Bash(git add:*)",
       "Bash(git commit:*)",
       "Bash(mkdir:*)",
-      "WebSearch"
+      "WebSearch",
+      "Bash(git merge:*)"
     ]
   }
 }