diff --git a/.story_kit/work/1_upcoming/238_story_mergemaster_handles_merge_conflicts_by_resolving_them_automatically.md b/.story_kit/work/1_upcoming/238_story_mergemaster_handles_merge_conflicts_by_resolving_them_automatically.md
new file mode 100644
index 0000000..71913ed
--- /dev/null
+++ b/.story_kit/work/1_upcoming/238_story_mergemaster_handles_merge_conflicts_by_resolving_them_automatically.md
@@ -0,0 +1,20 @@
+---
+name: "Mergemaster handles merge conflicts by resolving them automatically"
+---
+
+# Story 238: Mergemaster handles merge conflicts by resolving them automatically
+
+## User Story
+
+As a mergemaster agent, I want to detect and resolve merge conflicts when squash-merging feature branches, so that stories don't get stuck in the merge queue requiring manual intervention.
+
+## Acceptance Criteria
+
+- [ ] When merge_agent_work encounters a merge conflict, the mergemaster reads both sides of the conflict and produces a resolved file that preserves changes from both branches
+- [ ] After resolving conflicts, the mergemaster runs quality gates (cargo check, cargo test, pnpm build, pnpm test) to verify the resolution is correct
+- [ ] If quality gates fail after conflict resolution, the merge is reported as failed with details about what went wrong
+- [ ] The mergemaster handles the common case of multiple feature branches adding to the same file (e.g. both adding tests or UI sections to the same component)
+
+## Out of Scope
+
+- TBD