diff --git a/README.md b/README.md
index 11874ba..2f47ff1 100644
--- a/README.md
+++ b/README.md
@@ -125,11 +125,7 @@
 
 ## [Contributing](docs/contributing.md)
 
-<<<<<<< HEAD
-We welcome your contributions and thank you for working to improve the Go development experience in VS Code. If you would like to help work on the VS Code Go extension, please see our [contribution cuide](docs/contributing.md). It explains how to build and run the extension locally, and it describes the process of sending a contribution.
-=======
 We welcome your contributions and thank you for working to improve the Go development experience in VS Code. If you would like to help work on the VS Code Go extension, please see our [contribution guide](docs/contributing.md). It explains how to build and run the extension locally, and it describes the process of sending a contribution.
->>>>>>> master
 
 ## [Code of Conduct](CODE_OF_CONDUCT.md)