fix: better readme

Author: ger-benjamin

README.md

@@ -4,9 +4,7 @@
 
 [GeoStyler](https://github.com/terrestris/geostyler/) Style Parser for ArcGIS Pro layer file format `.lyrx`.
 
-<<<<<<< Updated upstream
 This project is originally based on the GeoCat/bridge-style (MIT license).
-=======
 This parser is still in an early stage. It can read Lyrx files and write GeoStyler styler, but it can not write Lyrx files.
 
 This project is originally based on the GeoCat/bridge-style (MIT license).
@@ -17,4 +15,3 @@ Maintenance and further development of this code can be funded through the
 [GeoStyler Open Collective](https://opencollective.com/geostyler). All contributions and
 expenses can transparently be reviewed by anyone; you see what we use the donated money for.
 Thank you for any financial support you give the GeoStyler project 💞
->>>>>>> Stashed changes