diff --git a/src/configs/channels.json b/src/configs/channels.json
index d2d1d42..f7ac350 100644
--- a/src/configs/channels.json
+++ b/src/configs/channels.json
@@ -1,15 +1,6 @@
-<<<<<<< HEAD
-{
-  "moderation": {
-    "modlogs": "446080867065135115",
-    "automod": ""
-  }
-}
-=======
 {
   "moderation": {
     "modlogs": "446080867065135115",
     "automod": ""
   }
 }
->>>>>>> Hiroyuki/communityrelations-master
diff --git a/src/configs/emotes.json b/src/configs/emotes.json
index eca8f56..3f0a0ab 100644
--- a/src/configs/emotes.json
+++ b/src/configs/emotes.json
@@ -1,19 +1,3 @@
-<<<<<<< HEAD
-{
-  "whois": {
-    "titleAndDepartment": "<:loc:607695848612167700>",
-    "email": "<:email:699786452267040878>",
-    "gitlab": "<:gitlab:699788655748841492>",
-    "github": "<:github:699786469404835939>",
-    "bio": "<:bio:699786408193294416>"
-  },
-  "statusMessages": {
-    "success": "<:modSuccess:578750988907970567>",
-    "loading": "<a:modloading:588607353935364106>",
-    "error": "<:modError:578750737920688128>"
-  }
-}
-=======
 {
   "whois": {
     "titleAndDepartment": "<:loc:607695848612167700>",
@@ -28,4 +12,3 @@
     "error": "<:modError:578750737920688128>"
   }
 }
->>>>>>> Hiroyuki/communityrelations-master