diff --git a/README.md b/README.md
index dfbc11aed0147e98e59f5e4fdf6bf2747fc573a1..6f6894eb8ea3f3589e501620fc7b36a85a0b3961 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 Stratpoint Global
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> 427f42e9a7147b168035817af17c0de597b89370