diff --git a/.story_kit/work/2_current/273_story_matrix_bot_sends_typing_indicator_while_waiting_for_claude_response.md b/.story_kit/work/2_current/273_story_matrix_bot_sends_typing_indicator_while_waiting_for_claude_response.md
new file mode 100644
index 0000000..a2c50fe
--- /dev/null
+++ b/.story_kit/work/2_current/273_story_matrix_bot_sends_typing_indicator_while_waiting_for_claude_response.md
@@ -0,0 +1,20 @@
+---
+name: "Matrix bot sends typing indicator while waiting for Claude response"
+---
+
+# Story 273: Matrix bot sends typing indicator while waiting for Claude response
+
+## User Story
+
+As a user chatting with the Matrix bot, I want to see a typing indicator in Element while the bot is processing my message, so that I know it received my request and is working on a response.
+
+## Acceptance Criteria
+
+- [ ] Bot sets m.typing on the room as soon as it starts the Claude API call
+- [ ] Typing indicator is cleared when the first response chunk is sent to the room
+- [ ] Typing indicator is cleared on error so it doesn't get stuck
+- [ ] No visible delay between sending a message and seeing the typing indicator
+
+## Out of Scope
+
+- TBD
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
deleted file mode 100644
index a2a6f09..0000000
--- a/.story_kit/work/4_merge/273_story_matrix_bot_sends_typing_indicator_while_waiting_for_claude_response.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-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
-
-## User Story
-
-As a user chatting with the Matrix bot, I want to see a typing indicator in Element while the bot is processing my message, so that I know it received my request and is working on a response.
-
-## Acceptance Criteria
-
-- [ ] Bot sets m.typing on the room as soon as it starts the Claude API call
-- [ ] Typing indicator is cleared when the first response chunk is sent to the room
-- [ ] Typing indicator is cleared on error so it doesn't get stuck
-- [ ] No visible delay between sending a message and seeing the typing indicator
-
-## Out of Scope
-
-- TBD