From a482ba1d720a95ab38d0530998bd1bb94b86dba5 Mon Sep 17 00:00:00 2001
From: rzzf <cszhjh@gmail.com>
Date: Thu, 20 Nov 2025 23:27:38 +0800
Subject: [PATCH] ci: fix remove conflict label (#22882)

---
 .github/workflows/pr-conflict.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-conflict.yml b/.github/workflows/pr-conflict.yml
index 78656ba515..ab882cfdaf 100644
--- a/.github/workflows/pr-conflict.yml
+++ b/.github/workflows/pr-conflict.yml
@@ -31,8 +31,9 @@ jobs:
       - name: Remove conflict pending label
         if: |
           github.repository_owner == 'element-plus' &&
-          github.event.pull_request.mergeable_state == 'clean'
+          github.event.pull_request.mergeable
         uses: actions-cool/issues-helper@v3
         with:
           actions: 'remove-labels'
           labels: 'conflict pending'
+          issue-number: ${{ github.event.pull_request.number }}