Refs #20542: Fix a couple of nitpicks

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

.github/workflows/documentation-tests.yaml

@@ -26,7 +26,8 @@ env:
 jobs:
   ubuntu-build-and-test-documentation:
     name: Documentation build and test
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
+    if: ${{ !(contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
+              contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
 
     runs-on: ubuntu-22.04
     steps:
@@ -171,4 +172,4 @@ jobs:
           print_summary: 'True'
           show_failed: 'True'
           show_disabled: 'False'
-          show_skipped: 'False'
+          show_skipped: 'False'