diff --git a/readme.md b/readme.md
index 769274c..15c717b 100644
--- a/readme.md
+++ b/readme.md
@@ -12,7 +12,11 @@ Pivot is a new programming language built on [JavaScript][javascript-site] by [E
 ---
 
 ### Documentation
+<<<<<<< HEAD
 The Pivot documentation is at [gthub.us/pivot/docs][pivot-docs].
+=======
+The Pivot documentation is at [gthub.us/pivot/docs][pivot-docs]
+>>>>>>> 5b5a7d16d47a4b3962ef8338f439a4e880d8a0cb
 
 [elementg9-user]: https://github.com/ElementG9/
 [pivot-site]: https://gthub.us/pivot/