diff --git a/README.md b/README.md
index 573c9e4762334b344083f2250652b445828d3739..8e3f076c6d5abd9b575f066fd4b1d8d7e5f8f56a 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,6 @@ BoBEAS
 | | |____scripinterp.patch
 | | |____scripinterp_mod.patch
 | | |____scripshape.patch
-<<<<<<< HEAD
-=======
-
-
->>>>>>> fd4ebfd3f245c028265f50995d167b3f6af98dd5
 |
 |____SCRIPTS
 | |____load_modules_1.sh