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 fa377db..c3d0dbd 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: "Auto-conflict resolution produced invalid Rust code in server/src/matrix/bot.rs. Both master and the feature branch modified the same region (~lines 790-865) — master added permission-handling logic inside a tokio::select! block, while the feature branch replaced that area with conversation history tracking code. The auto-resolver kept both additions, resulting in mismatched braces (unclosed delimiters at lines 801, 819, 822, 865). This is a complex structural conflict requiring manual resolution to determine which version of the code should be kept and how to integrate both changes."
 ---
 
 # Story 266: Matrix bot structured conversation history