beginning of the story pages
fixing merge conflicts