diff --git a/src/inc/trigger/parser.mjs b/src/inc/trigger/parser.mjs
index b79baef..4b923da 100644
--- a/src/inc/trigger/parser.mjs
+++ b/src/inc/trigger/parser.mjs
@@ -36,16 +36,6 @@ export default async bot => {
       if(!e.channel.includes("f0ck") && (!e.message.match(/\!f(0ck)?\b/i) && (typeof e.raw.forward_from == 'undefined')))
         return false;
 
-<<<<<<< Updated upstream
-      //if(e.type === 'tg' && !e.message.match(/\!f(0ck)?\b/i) && typeof e.raw.forward_from == 'undefined')
-      //  return false;
-      if(e.type === 'tg' &&
-        !e.message.match(/\!f(0ck)?\b/i) &&
-        !e.raw.forward_date
-      ) {
-        return false;
-      }
-=======
       if(e.type === 'tg' && // proto: tg
         !e.message.match(/\!f(0ck)?\b/i) && // !f / !f0ck
         !e.raw.forward_date && // is forwarded?
@@ -56,7 +46,6 @@ export default async bot => {
       else if(e.raw.media_group_id && e.message.match(/\!f(0ck)?\b/i)) {
         mediagroupids.add(e.raw.media_group_id);
       }
->>>>>>> Stashed changes
 
       console.log(`parsing ${links.length} link${links.length > 1 ? "s" : ""}...`);