Remove -Xours option

.github/workflows/publish-docs.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Rebase with main branch
         run: |
           git fetch
-          git rebase -Xours origin/main
+          git rebase origin/main
 
       - name: Install dependencies
         run: npm install