fixup! chore(ci): add conflict resolver to Update Nock file workflow

Author: aduh95

.github/workflows/update-nock-files.yml

@@ -34,8 +34,8 @@ jobs:
         if: ${{ !inputs.head_sha }}
         run: |
           set -x
-          [ "$(gh pr view "$GITHUB_SERVER/$GITHUB_REPOSITORY/pull/$PR_ID" \
-            --json headRepositoryOwner --jq '.headRepositoryOwner.name') = "$GITHUB_REPOSITORY_OWNER" ]
+          [ "$(gh pr view "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$PR_ID" \
+            --json headRepositoryOwner --jq '.headRepositoryOwner.name')" = "$GITHUB_REPOSITORY_OWNER" ]
         env:
           PR_ID: ${{ inputs.pr_id }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -60,7 +60,7 @@ jobs:
       - name: Merge base branch
         if: ${{ inputs.fix_conflicts }}
         run: |
-          git fetch "$GITHUB_SERVER/$GITHUB_REPOSITORY.git" HEAD
+          git fetch "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git" HEAD
           git merge FETCH_HEAD --no-edit -s ours
 
       - name: Install Node