Merge main and resolve conflict

Author: adamtheturtle

pyproject.toml

@@ -55,7 +55,7 @@ optional-dependencies.dev = [
     "pylint[spelling]==4.0.4",
     "pylint-per-file-ignores==3.2.0",
     "pyproject-fmt==2.15.1",
-    "pyrefly==0.51.2",
+    "pyrefly==0.52.0",
     "pyright==1.1.408",
     "pyroma==5.0.1",
     "pytest==9.0.2",