Merge pull request #1037 from kumvijaya/current

T7748: Updated conflict reusable workflow reference in workflow

Author: c-po

.github/workflows/check-pr-conflicts.yml

@@ -10,5 +10,5 @@ permissions:
 
 jobs:
   check-pr-conflict-call:
-    uses: vyos/.github/.github/workflows/check-pr-conflict.yml@current
+    uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
     secrets: inherit