diff --git a/.story_kit/work/4_merge/267_story_mcp_update_story_tool_should_support_front_matter_fields.md b/.story_kit/work/4_merge/267_story_mcp_update_story_tool_should_support_front_matter_fields.md
index 2fddf6a..820a866 100644
--- a/.story_kit/work/4_merge/267_story_mcp_update_story_tool_should_support_front_matter_fields.md
+++ b/.story_kit/work/4_merge/267_story_mcp_update_story_tool_should_support_front_matter_fields.md
@@ -1,5 +1,6 @@
 ---
 name: "MCP update_story tool should support front matter fields"
+merge_failure: "Merge had 2 unresolvable conflicts: (1) .mcp.json modify/delete conflict — deleted in master but modified in feature branch. (2) Story file rename/rename conflict — renamed to work/4_merge/ in master but to work/2_current/ in feature branch. Auto-resolution failed. Master is untouched."
 ---
 
 # Story 267: MCP update_story tool should support front matter fields