diff --git a/README.md b/README.md
index a8be095..9778dd0 100644
--- a/README.md
+++ b/README.md
@@ -139,13 +139,8 @@ requests:
               contents: "You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 2"
 ```
 
-<<<<<<< HEAD
 Read the configuration reference [here](./docs/config.md) or see the examples [here](./Examples). 
 
-=======
-Read the config documentation [here](./docs/config.md) or see the examples [here](./Examples)
->>>>>>> 5062f89 (lint)
-
 ## Future work
 
 -   [x] Create examples folder to show HASH features