diff --git a/test123.txt b/test123.txt
index 026628f..7d95326 100644
--- a/test123.txt
+++ b/test123.txt
@@ -1,7 +1,3 @@
 teste243434
 
-<<<<<<< HEAD
 branch2 22
-=======
-branch1
->>>>>>> 47809d15fb6d3880139f8129840abbcf1df785a1