diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 5285682b2..207e7de12 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -60,12 +60,12 @@ jobs:
           echo "Repository root: ${{ github.workspace }}"
           echo "Branch: ${{ github.ref }}"
           echo "List of tests"
-          pytest ${{ github.workspace }}/llama_stack/providers/tests/ --html=report.html --config=ci_test_config.yaml
+          pytest ${{ github.workspace }}/llama_stack/providers/tests/ --config=ci_test_config.yaml
 
       - name: Upload pytest test results
         uses: actions/upload-artifact@v4
         with:
-          name: report.html
-          path: report.html
+          name: pytest_report.md
+          path: pytest_report.md
         # Use always() to always run this step to publish test results when there are test failures
         if: ${{ always() }}
diff --git a/llama_stack/providers/tests/report.py b/llama_stack/providers/tests/report.py
index 86bcce90b..bc1c13263 100644
--- a/llama_stack/providers/tests/report.py
+++ b/llama_stack/providers/tests/report.py
@@ -6,10 +6,7 @@
 
 
 from collections import defaultdict
-<<<<<<< HEAD
 from pathlib import Path
-=======
->>>>>>> 991f0e0 (ci test report)
 
 import pytest
 from llama_models.datatypes import CoreModelId