fixed sitemap
completed merge