Fix conflicts

Author: norkans7

.github/workflows/ci.yml

@@ -5,10 +5,10 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     container:
-      image: python:${{ matrix.python-version }}-bookworm
+      image: python:${{ matrix.python-version }}-trixie
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.12", "3.13", "3.14"]
 
     steps:
       - name: Checkout code
@@ -44,7 +44,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     container:
-      image: python:3.10-bookworm
+      image: python:3.12-trixie
     steps:
       - name: Checkout code
         uses: actions/checkout@v4