diff --git a/.github/workflows/Conflict marking b/.github/workflows/conflicts.yml similarity index 100% rename from .github/workflows/Conflict marking rename to .github/workflows/conflicts.yml