update js to correctly work and git now ignore sitemap
fix conflict