diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ffc539917..a87db9c686 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,11 +18,7 @@ on:
 
 # On PR events, cancel existing CI runs on this same PR for this workflow.
 concurrency:
-<<<<<<< HEAD
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
-=======
-  group: ${{ github.workflow }}-${{ github.ref }}
->>>>>>> df3f7106c (fix: restore concurrency in main workflow)
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs: