diff --git a/domains/blog.jorgemayor.json b/domains/blog.jorgemayor.json
index d3ac04d665..c27e3c39a1 100644
--- a/domains/blog.jorgemayor.json
+++ b/domains/blog.jorgemayor.json
@@ -5,10 +5,6 @@
         "email": "joorgemayoor@gmail.com"
     },
     "records": {
-<<<<<<< HEAD
         "A": ["88.0.97.219"]
-=======
-        "A": ["83.36.65.55"]
->>>>>>> e9ec10b4e5e77d994eba261ece29e6221d0f10dd
     }
 }