Update README.md

Author: timkpaine

README.md

@@ -36,12 +36,9 @@ pip install yardang
 
 Or from `conda-forge` via `conda`:
 
-<<<<<<< before updating
 ```bash
 conda install yardang -c conda-forge
 ```
 
-=======
->>>>>>> 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).