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 6d43b7b..671ad64 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,6 +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 feature branch has it in 2_current/ (both renamed from 1_upcoming/). Auto-resolver failed because the original file in 1_upcoming/ no longer exists. Master is untouched."
+merge_failure: "Rename/rename conflict on the story file: .story_kit/work/1_upcoming/274_story_mcp_pipeline_status_tool_with_agent_assignments.md was renamed to 4_merge/ on master but to 2_current/ on the feature branch. Auto-resolution failed because the file no longer exists at its original path. This is a story pipeline state conflict, not a code conflict. Human needs to resolve the story file location before re-triggering merge."
 ---
 
 # Story 274: MCP pipeline status tool with agent assignments