diff --git a/text.txt b/text.txt
index d24ac41..ba5fe8b 100644
--- a/text.txt
+++ b/text.txt
@@ -1,3 +1,7 @@
 string1
+<<<<<<< HEAD
 string2
-string3
\ No newline at end of file
+string3
+=======
+string2string4
+>>>>>>> origin/master