diff --git a/.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md b/.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md
index 61138d9..e4f3b97 100644
--- a/.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md
+++ b/.story_kit/work/4_merge/269_story_file_references_in_web_ui_chat_input.md
@@ -1,5 +1,6 @@
 ---
 name: "@ file references in web UI chat input"
+merge_failure: "Rename/rename conflict on story file: master has it in work/4_merge/ but the feature branch has it in work/2_current/. The auto-resolver failed because it tried to read from the original 1_upcoming/ path which no longer exists on either side. This is a story pipeline state conflict that needs manual resolution."
 ---
 
 # Story 269: @ file references in web UI chat input