[chore](autopick)Change the conflict label to dev/2.1.x-conflict dev/…

…3.0.x-conflict (#43917)

Keep it consistent with the conflicting labels we picked earlier

.github/workflows/auto-cherry-pick.yml

@@ -59,14 +59,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO_NAME: ${{ github.repository }}
-          CONFLICT_LABEL: cherry-pick-conflict-in-3.0
+          CONFLICT_LABEL: dev/3.0.x-conflict
         run: |
           python tools/auto-pick-script.py ${{ github.event.pull_request.number }} branch-3.0  
       - name: Auto cherry-pick to branch-2.1
         if: ${{ ((github.event.action == 'labeled' && github.event.label.name == 'dev/2.1.x'))|| ((github.event_name == 'pull_request_target' && github.event.action == 'closed') && contains(github.event.pull_request.labels.*.name, 'dev/2.1.x')) }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO_NAME: ${{ github.repository }}
-          CONFLICT_LABEL: cherry-pick-conflict-in-2.1.x
+          CONFLICT_LABEL: dev/2.1.x-conflict
         run: |
             python tools/auto-pick-script.py ${{ github.event.pull_request.number }} branch-2.1