Add merge-conflict-bot-main-trigger branch to workflow

Signed-off-by: cheese-cakee <farzanaman99@gmail.com>

Author: cheese-cakee

.github/workflows/merge-conflict-bot.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - 'merge-conflict-bot-main-trigger'
 
 permissions:
   contents: read