diff --git a/.github/workflows/repo-merge-conflict.yaml b/.github/workflows/repo-merge-conflict.yaml
index 97424360..c61e6bd6 100644
--- a/.github/workflows/repo-merge-conflict.yaml
+++ b/.github/workflows/repo-merge-conflict.yaml
@@ -2,17 +2,25 @@ name: Repo / Label merge conflict
 
 on:
   push:
+    branches:
+      - master
   pull_request_target:
     types:
       - synchronize
 
+permissions: {}
+
 jobs:
   triage:
     name: Triage
     runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+      pull-requests: write
     if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
       - uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
         with:
-          dirtyLabel: merge conflict
+          dirtyLabel: 'merge conflict'
+          commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
           repoToken: ${{ secrets.JF_BOT_TOKEN }}