diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 44b98ec46d0..9949e259f44 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -18,7 +18,11 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+<<<<<<< HEAD
         uses: contributor-assistant/github-action@v2.6.1
+=======
+        uses: contributor-assistant/github-action@v2.5.1
+>>>>>>> c2dd1a5e (undo cla deletion, can disable manually)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret
@@ -40,4 +44,8 @@ jobs:
           #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
           #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
           #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
+<<<<<<< HEAD
           #use-dco-flag: true - If you are using DCO instead of CLA
+=======
+          #use-dco-flag: true - If you are using DCO instead of CLA
+>>>>>>> c2dd1a5e (undo cla deletion, can disable manually)