diff --git a/test.txt b/test.txt
index 13278b3..c705c78 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1,5 @@
-10086
\ No newline at end of file
+<<<<<<< HEAD
+10086
+=======
+111
+>>>>>>> dev
diff --git a/text1.2.txt b/text1.2.txt
new file mode 100644
index 0000000..e69de29