fix conflicts

Author: bhillmer

.github/workflows/repo-sync.yml

@@ -15,7 +15,7 @@ jobs:
     if: ${{ github.repository == 'splunk/public-o11y-docs' || github.repository == 'splunk/private-o11y-docs' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: repo-sync/github-sync@v2
       name: Sync repo to branch
       with:

.github/workflows/vale-linter.yml

@@ -27,7 +27,7 @@ jobs:
           unzip latest.zip -d .
       - name: Get all changed docs
         id: changed-files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         with:
           files: |
             **/*.rst