diff --git a/netlify.toml b/netlify.toml
index 10781ec1..96c85a1c 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -81,19 +81,16 @@
   from = "/talks/serve"
   to = "https://speakerdeck.com/philhawksworth/serving-for-the-win-deployments-and-infrastructure-for-the-rest-of-us"
   status = 302
-<<<<<<< HEAD
 
  [[redirects]]
   from = "/talks/jsheroes"
   to = "https://speakerdeck.com/philhawksworth/serving-for-the-win-deployments-and-infrastructure-for-the-rest-of-us"
   status = 302
-=======
-  
+
  [[redirects]]
   from = "/talks/netlify-intro"
-  to = "https://speakerdeck.com/philhawksworth/netlify-show-and-tell"  
+  to = "https://speakerdeck.com/philhawksworth/netlify-show-and-tell"
   status = 302
-  
-  
-  
->>>>>>> 2aafdeaab2fcd9d5c15289b85bbd2e75efa09a4e
+
+
+