diff --git a/.story_kit/work/4_merge/273_story_matrix_bot_sends_typing_indicator_while_waiting_for_claude_response.md b/.story_kit/work/4_merge/273_story_matrix_bot_sends_typing_indicator_while_waiting_for_claude_response.md
index a2c50fe..a2a6f09 100644
--- a/.story_kit/work/4_merge/273_story_matrix_bot_sends_typing_indicator_while_waiting_for_claude_response.md
+++ b/.story_kit/work/4_merge/273_story_matrix_bot_sends_typing_indicator_while_waiting_for_claude_response.md
@@ -1,5 +1,6 @@
 ---
 name: "Matrix bot sends typing indicator while waiting for Claude response"
+merge_failure: "Complex conflict in server/src/matrix/bot.rs: The feature branch replaced the tokio::select! loop (which handles permission forwarding) with a direct provider.chat_stream().await to add typing indicators. Master's permission-handling code and the feature branch's typing-indicator code both modify the same function structure. The auto-resolver merged both additions but produced broken brace nesting (mismatched delimiters at lines 832/875). Fixing this requires integrating typing indicator logic into the existing tokio::select! loop — a logic change, not a syntax fix. The coder needs to rebase onto master and incorporate the permission-handling tokio::select! loop while preserving the typing indicator feature."
 ---
 
 # Story 273: Matrix bot sends typing indicator while waiting for Claude response