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