diff --git a/.story_kit/work/1_upcoming/135_story_update_mergemaster_prompt_to_allow_conflict_resolution_and_code_fixes.md b/.story_kit/work/2_current/135_story_update_mergemaster_prompt_to_allow_conflict_resolution_and_code_fixes.md similarity index 100% rename from .story_kit/work/1_upcoming/135_story_update_mergemaster_prompt_to_allow_conflict_resolution_and_code_fixes.md rename to .story_kit/work/2_current/135_story_update_mergemaster_prompt_to_allow_conflict_resolution_and_code_fixes.md