diff --git a/.story_kit/work/4_merge/263_story_matrix_bot_self_signs_device_keys_at_startup_for_verified_encryption.md b/.story_kit/work/4_merge/263_story_matrix_bot_self_signs_device_keys_at_startup_for_verified_encryption.md
index 0f8d6f4..fdfa58f 100644
--- a/.story_kit/work/4_merge/263_story_matrix_bot_self_signs_device_keys_at_startup_for_verified_encryption.md
+++ b/.story_kit/work/4_merge/263_story_matrix_bot_self_signs_device_keys_at_startup_for_verified_encryption.md
@@ -1,5 +1,6 @@
 ---
 name: "Matrix bot self-signs device keys at startup for verified encryption"
+merge_failure: "Rename/rename conflict on the story file: .story_kit/work/1_upcoming/263_story_matrix_bot_self_signs_device_keys_at_startup_for_verified_encryption.md was renamed to 4_merge/ on master but to 2_current/ on the feature branch. Auto-resolution failed because the original file no longer exists at the 1_upcoming path. This is a story file pipeline state conflict, not a code conflict."
 ---
 
 # Story 263: Matrix bot self-signs device keys at startup for verified encryption