Update hatchling version and lint ignores in pyproject

Author: timkpaine

pyproject.toml

@@ -1,13 +1,8 @@
 [build-system]
-<<<<<<< before updating
-requires = ["hatchling>=1.20"]
-build-backend = "hatchling.build"
-=======
 requires = [
     "hatchling",
 ]
 build-backend="hatchling.build"
->>>>>>> after updating
 
 [project]
 name = "hatch-js"
@@ -164,11 +159,7 @@ section-order = [
 ]
 
 [tool.ruff.lint.per-file-ignores]
-<<<<<<< before updating
-"__init__.py" = ["F401", "F403"]
-=======
 "__init__.py" = [
     "F401",
     "F403",
 ]
->>>>>>> after updating