Update story.md
FIXED CONFLICT