Update README.md

Author: timkpaine

README.md

@@ -9,10 +9,7 @@ Hatch plugin for JavaScript
 
 ## Overview
 
-<<<<<<< before updating
 Wrapper for [hatch-js](https://github.com/python-project-templates/hatch-js)
 
-=======
->>>>>>> after updating
 > [!NOTE]
 > This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).