diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index edd03de5df..6e91cdaa01 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -63,5 +63,9 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: java_sarif
+<<<<<<< HEAD
         path: .results/java.sarif
+=======
+        path: ./results/java.sarif
+>>>>>>> 3f7f14107 (Fix upload path)
         retention-days: 5