conflict solving

Author: Bloxster

src/installation/upgrading-md

@@ -43,10 +43,6 @@ If you're using Docker to run Erigon, the process to upgrade to a newer version
     docker pull erigontech/erigon:<new_version_tag>
     ```
 
-<<<<<<< HEAD
-=======
-
->>>>>>> d04463c (Update to v3.00.0-beta1 (#7))
     Replace `<new_version_tag>` with the actual version tag you wish to use. For example:
 
     ```bash