diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 5c7b725a0..ac570db05 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -22,7 +22,15 @@ jobs:
         owner: ModernUO
         repo: ModernUO
         excludes: prerelease, draft
+<<<<<<< Updated upstream
     - name: Create Fake tag
+=======
+    - name: Git Credentials
+      uses: oleksiyrudenko/gha-git-credentials@v2-latest
+      with:
+        token: '${{ secrets.GITHUB_TOKEN }}'
+    - name: Create fake tag for diffing
+>>>>>>> Stashed changes
       run: |
         git config --global user.name "Fake Tag Action"
         git config --global user.email "hi@modernuo.com"
@@ -36,14 +44,18 @@ jobs:
       id: changelog
       uses: TriPSs/conventional-changelog-action@v3
       with:
-        github-token: ${{ secrets.github_token }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
         output-file: false
         skip-version-file: true
         skip-commit: true
         release-count: 1
+<<<<<<< Updated upstream
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Delete v${{ steps.changelog.outputs.version }} Tag
+=======
+    - name: Delete Fake Release
+>>>>>>> Stashed changes
       uses: dev-drprasad/delete-tag-and-release@v0.1.3
       with:
         delete_release: true