diff --git a/sitemap.xml b/sitemap.xml
index 3c8fb09..98f17b9 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -11,11 +11,7 @@ search: exclude
     <url>
         <loc>{{ page.url }}</loc>
         <lastmod>{{ site.time | date: '%Y-%m-%d' }}</lastmod>
-<<<<<<< HEAD
         <changefreq>hourly</changefreq>
-=======
-        <changefreq>always</changefreq>
->>>>>>> 33d7045a1dea50b0ffc13dfc815da48a2797d44d
         <priority>0.5</priority>
     </url>
     {% endif %}
@@ -26,11 +22,7 @@ search: exclude
     <url>
         <loc>{{ post.url }}</loc>
         <lastmod>{{ site.time | date: '%Y-%m-%d' }}</lastmod>
-<<<<<<< HEAD
         <changefreq>hourly</changefreq>
-=======
-        <changefreq>always</changefreq>
->>>>>>> 33d7045a1dea50b0ffc13dfc815da48a2797d44d
         <priority>0.5</priority>
     </url>
     {% endfor %}