diff --git a/_config.yml b/_config.yml
index 720a8ab..f1d6b95 100644
--- a/_config.yml
+++ b/_config.yml
@@ -68,7 +68,6 @@ gitalk:
   repo: endworld
   owner: FromEndWorld
 
-<<<<<<< HEAD
 # Enter your Google Analytics web tracking code (e.g. UA-2110908-2) to activate tracking
 google_analytics: UA-143053266-1