diff --git a/lib/template.html b/lib/template.html
index 6697942..53dca26 100644
--- a/lib/template.html
+++ b/lib/template.html
@@ -113,14 +113,12 @@
   {% endif %}
 {% endif %}
 
-<<<<<<< HEAD
-{% if site.google_site_verification %}
-  <meta name="google-site-verification" content="{{ site.google_site_verification }}" />
-=======
 {% if site.facebook %}
   <meta property="article:publisher" content="{{ site.facebook.publisher }}" />
   <meta property="fb:app_id" content="{{ site.facebook.app_id }}" />
->>>>>>> master
+
+{% if site.google_site_verification %}
+  <meta name="google-site-verification" content="{{ site.google_site_verification }}" />
 {% endif %}
 
 {% if site.logo %}