diff --git a/domains/satya.json b/domains/satya.json
index 1f70154706..9e285656d2 100644
--- a/domains/satya.json
+++ b/domains/satya.json
@@ -1,16 +1,4 @@
 {
-<<<<<<< Updated upstream
-  "owner": {
-    "username": "Satya-Siba-Nayak",
-    "email": "ssnayak8806@gmail.com"
-  },
-  "records": {
-    "CNAME": "Satya-Siba-Nayak.github.io"
-  },
-  "description": "My personal website/portfolio",
-  "proxied": true
-}
-=======
     "owner": {
       "username": "Satya-Siba-Nayak",
       "discord": "satya8806"
@@ -21,4 +9,3 @@
     "description": "My personal website/portfolio",
     "proxied": true
   }
->>>>>>> Stashed changes