diff --git a/.github/workflows/generate-leaderboard.yml b/.github/workflows/generate-leaderboard.yml
index 5187b7a..8f85ae5 100644
--- a/.github/workflows/generate-leaderboard.yml
+++ b/.github/workflows/generate-leaderboard.yml
@@ -39,4 +39,5 @@ jobs:
           fi
           git add data/leaderboard.json
           git commit -m "chore: update leaderboard data"
+          git pull --rebase --autostash origin main || (echo "Rebase failed due to conflicts" && exit 1)
           git push
\ No newline at end of file