Fix merge conflicts in pytest workflow

Resolved merge conflicts and adjusted Python versions.

Author: cclauss

.github/workflows/pytest.yml

@@ -32,19 +32,7 @@ jobs:
         # os: [ubuntu-latest, macos-latest, windows-latest]
         # python-version: ["3.9", "3.10", "3.11", "3.12", "pypy3.9", "pypy3.10"]
         os: [ubuntu-latest]
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        python-version: ["3.9", "3.14"]
-=======
-        python-version: ["3.9", "3.14t"]
->>>>>>> ca654c38 (GitHub Actions: Run pytest on free threaded Python 3.14t)
-=======
-        python-version: ["3.9", "3.14"]
->>>>>>> 73981943 (Revert from free threading Python 3.14t to 3.14)
-=======
         python-version: ["3.9", "3.14", "3.14t"]
->>>>>>> 7a18a2da (Add Python version '3.14t' to pytest workflow)
 
     steps:
       - name: Harden the runner (Audit all outbound calls)