diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index b6bf541..f95161c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -67,7 +67,8 @@ jobs:
     - name: Attempt to make a PR fixing spotless errors
       if: ${{ failure() && steps.build_mod.conclusion == 'failure' && github.event_name == 'pull_request' && !github.event.pull_request.draft }}
       run: |
-        git reset --hard "${PR_BRANCH}"
+        git reset --hard
+        git checkout --theirs "${PR_BRANCH}"
         ./gradlew --info --stacktrace spotlessApply || exit 1
         git diff --exit-code && exit 1
         git config user.name "GitHub GTNH Actions"