Conan did not change back to Shinichi at the end of the story.
However, this ending is also beautiful.
Note:
The premise of the article is that Haibara-san died in the decisive battle of the dark organization.
Dr. Agasa is not the final boss
Finally, this is just a short story.
Conception: