diff --git a/backend/src/plugins/Automod/functions/runAutomod.ts b/backend/src/plugins/Automod/functions/runAutomod.ts
index 1224bc2b..bc8b5c19 100644
--- a/backend/src/plugins/Automod/functions/runAutomod.ts
+++ b/backend/src/plugins/Automod/functions/runAutomod.ts
@@ -44,10 +44,8 @@ export async function runAutomod(pluginData: GuildPluginData<AutomodPluginType>,
     ) {
       continue;
     }
-<<<<<<< HEAD
+
     if (!rule.affects_self && userId && userId === pluginData.client.user?.id) continue;
-=======
->>>>>>> added thread_create and thread_delete automod triggers
 
     if (rule.cooldown && checkAndUpdateCooldown(pluginData, rule, context)) {
       continue;