diff --git a/.story_kit/work/4_merge/274_story_mcp_pipeline_status_tool_with_agent_assignments.md b/.story_kit/work/4_merge/274_story_mcp_pipeline_status_tool_with_agent_assignments.md
index ed60c18..0199e76 100644
--- a/.story_kit/work/4_merge/274_story_mcp_pipeline_status_tool_with_agent_assignments.md
+++ b/.story_kit/work/4_merge/274_story_mcp_pipeline_status_tool_with_agent_assignments.md
@@ -1,5 +1,6 @@
 ---
 name: "MCP pipeline status tool with agent assignments"
+merge_failure: "Rename/rename conflict on story file: master has it in 4_merge/ but the feature branch has it in 2_current/. The auto-resolver couldn't read the file from its original 1_upcoming/ location (already moved on both sides). This is a story pipeline file conflict that needs manual resolution."
 ---
 
 # Story 274: MCP pipeline status tool with agent assignments