Update README.md

Author: timkpaine

README.md

@@ -8,10 +8,7 @@ Hatch plugin for Rust
 [![PyPI](https://img.shields.io/pypi/v/hatch-rust.svg)](https://pypi.python.org/pypi/hatch-rust)
 
 ## Overview
-<<<<<<< before updating
 Wrapper for [hatch-rs](https://github.com/python-project-templates/hatch-rs)
-=======
->>>>>>> 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).