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