adding footer and header to the page layout
fixing merge conflict