diff --git a/.github/workflows/openhands-resolver.yml b/.github/workflows/openhands-resolver.yml
index f262649..34eda76 100644
--- a/.github/workflows/openhands-resolver.yml
+++ b/.github/workflows/openhands-resolver.yml
@@ -83,7 +83,11 @@ jobs:
           LLM_BASE_URL: ${{ secrets.LLM_BASE_URL }}
           PYTHONPATH: ""
         run: |
+<<<<<<< HEAD
+          PYTHONPATH="" python -m openhands_resolver.resolve_issues \
+=======
           PYTHONPATH=""python -m openhands_resolver.resolve_issues \
+>>>>>>> 91caa6a852de90ca97ea7e8c999e334b1d012a0a
             --repo ${{ github.repository }} \
             --issue-numbers ${{ env.ISSUE_NUMBER }}