Conflicts resolved
Sitemap generator Added