story.html complete
Merge conflict resolution