diff --git a/.story_kit/work/4_merge/266_story_matrix_bot_structured_conversation_history.md b/.story_kit/work/4_merge/266_story_matrix_bot_structured_conversation_history.md
index 7865d38..aa6c31a 100644
--- a/.story_kit/work/4_merge/266_story_matrix_bot_structured_conversation_history.md
+++ b/.story_kit/work/4_merge/266_story_matrix_bot_structured_conversation_history.md
@@ -1,5 +1,6 @@
 ---
 name: "Matrix bot structured conversation history"
+merge_failure: "Rename/rename conflict on story file: .story_kit/work/1_upcoming/266_story_matrix_bot_structured_conversation_history.md was renamed to 4_merge/ on master and to 2_current/ on the feature branch. The auto-resolver failed because it tried to read the file from 1_upcoming/ which no longer exists. Master is untouched. This needs manual conflict resolution - the story file needs to end up in the correct pipeline stage before re-merging."
 ---
 
 # Story 266: Matrix bot structured conversation history