diff --git a/text.txt b/text.txt
index 6013629..ea70dea 100644
--- a/text.txt
+++ b/text.txt
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
 string1!
 string2!
-string3!
\ No newline at end of file
+string3!
+=======
+string1
+string2
+string3
+string4
+>>>>>>> text4