Merge branch 'mergify/bp/v4.2.x/pr-14803' into v4.2.x

Author: michaelklishin

.github/workflows/test-make-target.yaml

@@ -54,19 +54,6 @@ jobs:
         # restricted to the build jobs to avoid duplication in output.
         disable_problem_matchers: true
 
-<<<<<<< HEAD
-=======
-    # We install Erlang problem matchers from ci.erlang.mk.
-    - name: CHECKOUT ERLANG PROBLEM MATCHERS
-      uses: actions/checkout@v5
-      with:
-        repository: ninenines/ci.erlang.mk
-        path: ci.erlang.mk
-
-    - name: INSTALL ERLANG PROBLEM MATCHERS
-      run: echo "::add-matcher::ci.erlang.mk/.github/matchers/erlang-matchers.json"
-
->>>>>>> 534f3f812 (Bump actions/checkout from 4 to 5)
     - name: MIXED CLUSTERS - FETCH SIGNING KEYS
       uses: dsaltares/fetch-gh-release-asset@master
       if: inputs.mixed_clusters