diff --git a/README.md b/README.md
index 23d2a42..ea1e39f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Teso Business 2.0
 
 The Teso Business 2.0 angular source code