diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml
index ed349c74ad34..8a42c575c3fd 100644
--- a/.github/workflows/auto_approve.yml
+++ b/.github/workflows/auto_approve.yml
@@ -9,6 +9,9 @@ jobs:
     runs-on: ubuntu-latest
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 77e8fd27c1 (Run auto approve only on qmk/qmk_firmware (#16786))
     if: github.repository == 'qmk/qmk_firmware'
 
     steps: