diff --git a/.github/workflows/create-demo.yml b/.github/workflows/create-demo.yml
index 8b30b81..bb5748c 100644
--- a/.github/workflows/create-demo.yml
+++ b/.github/workflows/create-demo.yml
@@ -117,6 +117,13 @@ jobs:
               git commit -m "docs: update demo recording" \
                          -m "Auto-generated by create-demo workflow." \
                          -m "[skip ci]"
+              # Pull any new commits to avoid race condition with other workflows
+              git pull --rebase origin main || {
+                echo "⚠️ Rebase failed, trying merge strategy"
+                git rebase --abort 2>/dev/null || true
+                git pull origin main
+              }
+
               git push
               echo "✓ Demo updated and committed"
             else