diff --git a/src/class/Util.ts b/src/class/Util.ts
index 613c479..f31a4ca 100644
--- a/src/class/Util.ts
+++ b/src/class/Util.ts
@@ -126,12 +126,4 @@ export default class Util {
     const asHex = number.toString(16);
     return '#000000'.substring(0, 7 - asHex.length) + asHex;
   }
-<<<<<<< HEAD
-=======
-
-  public guildFromMessage(message: Message): Guild | null {
-    if (message.channel instanceof PrivateChannel || message.channel instanceof GroupChannel) return null;
-    return message.channel.guild;
-  }
->>>>>>> dev
 }