Working on Books page and content
fixing merge conflicts