node sitemap conflict / mege dev to remote