adds correct header and footer partials to index page
fixes merge conflict