added back to top link
fixing conflicts
working on the sitemap in the footer
fixing conflicts