working on pages
fixing merge conflicts