diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index 54b381d7f89..30ca22aedc5 100644
--- a/.github/workflows/patch.yml
+++ b/.github/workflows/patch.yml
@@ -5,7 +5,6 @@ on:
     paths-ignore:
       - '**.js'
       - '**.md'
-    types: [opened, unlabeled, synchronize, reopened]
   workflow_dispatch:
 
 
@@ -30,11 +29,6 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
     steps:
-      - name: Check for merge conficts label
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'conflicts') }}
-        run: |
-          echo "Remove merge conflicts and remove conflict label to run CI"
-          exit 1
       - name: Clone
         uses: actions/checkout@v2
 
diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml
index 1c9743c5700..c62622eecec 100644
--- a/.github/workflows/server-tests.yml
+++ b/.github/workflows/server-tests.yml
@@ -5,7 +5,6 @@ on:
     paths-ignore:
       - '**.js'
       - '**.md'
-    types: [opened, unlabeled, synchronize, reopened]
   workflow_dispatch:
   push:
     branches: [ develop ]
@@ -40,12 +39,6 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
     steps:
-      - name: Check for merge conficts label
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'conflicts') }}
-        run: |
-          echo "Remove merge conflicts and remove conflict label to run CI"
-          exit 1
-
       - name: Clone
         uses: actions/checkout@v2