diff --git a/domains/blog.jorgemayor.json b/domains/blog.jorgemayor.json
index dcc85a25e3..c27e3c39a1 100644
--- a/domains/blog.jorgemayor.json
+++ b/domains/blog.jorgemayor.json
@@ -4,12 +4,7 @@
         "username": "Joorg3Mayoor",
         "email": "joorgemayoor@gmail.com"
     },
-<<<<<<< HEAD
-    "record": {
-        "A": ["88.0.97.219"]
-=======
     "records": {
-        "A": ["83.36.65.55"]
->>>>>>> 35673454fd414dfd5272e7189b05329739b65e98
+        "A": ["88.0.97.219"]
     }
 }