diff --git a/README.md b/README.md
index 0189933b240ebc8cfd894c1edb736a7d5dddc7e6..2965ab1e5d562681ca69af470c808700f58ab21a 100644
--- a/README.md
+++ b/README.md
@@ -44,4 +44,7 @@ In the terminal, use this format to run the tool
 
 
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> dfbe33c57633a0d695d087265416a8a400a168bd