diff --git a/discord/src/main/java/me/totalfreedom/discord/util/SnowflakeEntry.java b/discord/src/main/java/me/totalfreedom/discord/util/SnowflakeEntry.java
index c72b9165..91d0fc38 100644
--- a/discord/src/main/java/me/totalfreedom/discord/util/SnowflakeEntry.java
+++ b/discord/src/main/java/me/totalfreedom/discord/util/SnowflakeEntry.java
@@ -36,12 +36,8 @@ public enum SnowflakeEntry
         return Snowflake.of(entry.getString());
     }
 
-<<<<<<< HEAD
     public static Set<Snowflake> acceptableRoleIDs()
     {
-=======
-    public static Set<Snowflake> acceptableRoleIDs() {
->>>>>>> refs/remotes/origin/RELEASE-2023.03
         Set<Snowflake> acceptableRoleIDs = new HashSet<>();
         acceptableRoleIDs.add(SnowflakeEntry.OWNER_ROLE_ID.getSnowflake());
         acceptableRoleIDs.add(SnowflakeEntry.DEVELOPER_ROLE_ID.getSnowflake());