diff --git a/domains/satya.json b/domains/satya.json
index 1f70154706..cc3163e999 100644
--- a/domains/satya.json
+++ b/domains/satya.json
@@ -1,24 +1,11 @@
 {
-<<<<<<< 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"
     },
     "records": {
-      "CNAME": "Satya-Siba-Nayak.github.io"
+      "CNAME": "satya.qzz.io"
     },
     "description": "My personal website/portfolio",
     "proxied": true
   }
->>>>>>> Stashed changes