diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index a6afef46..c0f5338f 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -31,7 +31,9 @@
       "mcp__ide__getDiagnostics",
       "Bash(npm install:*)",
       "mcp__serena__read_memory",
-      "Bash(git add:*)"
+      "Bash(git add:*)",
+      "Bash(git merge:*)",
+      "Bash(git commit:*)"
     ],
     "deny": [],
     "ask": [],
@@ -51,4 +53,4 @@
     "feishu-api",
     "shadcn-ui-server"
   ]
-}
\ No newline at end of file
+}