diff --git a/.gitignore b/.gitignore
index a506026..1d0be17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,9 @@ store.json
 # Matrix SDK state store
 .story_kit/matrix_store/
 
-# Agent worktrees (managed by the server, not tracked in git)
+# Agent worktrees and merge workspace (managed by the server, not tracked in git)
 .story_kit/worktrees/
+.story_kit/merge_workspace/
 
 # Coverage reports (generated by cargo-llvm-cov, not tracked in git)
 .story_kit/coverage/