rebase and fix some bad merges

Author: Obada Haddad

tests/.python-version

@@ -3,29 +3,18 @@ name = "tests"
 version = "0.1.0"
 description = "Add your description here"
 readme = "README.md"
-<<<<<<< HEAD
 requires-python = "==3.14.0"
 dependencies = [
     "loguru~=0.7.3",
     "psycopg[binary]~=3.2.13",
     "pytest==9.0.2",
-=======
-requires-python = ">=3.9"
-dependencies = [
-    "loguru~=0.7.3",
-    "psycopg[binary]~=3.2.13",
-    "pytest~=8.4.2",
->>>>>>> 1bd0764b (restore tests/*)
     "pytest-playwright~=0.7.1",
     "pytest-xdist~=3.8.0",
     "toml~=0.10.2",
 ]
-<<<<<<< HEAD
 [tool.pytest.ini_options]
 # Use localhost as default host
 # addopts = --base-url=localhost --headed --browser webkit --browser firefox --browser chromium --numprocesses 2
 addopts = "--base-url=http://localhost:8000 --browser firefox --screenshot only-on-failure --full-page-screenshot"
 log_cli = "true"
 log_cli_level = "INFO"
-=======
->>>>>>> 1bd0764b (restore tests/*)