diff --git a/test123.txt b/test123.txt
index 0b9b200..026628f 100644
--- a/test123.txt
+++ b/test123.txt
@@ -1,3 +1,7 @@
 teste243434
 
-branch2 22
\ No newline at end of file
+<<<<<<< HEAD
+branch2 22
+=======
+branch1
+>>>>>>> 47809d15fb6d3880139f8129840abbcf1df785a1