diff --git a/111.txt b/111.txt
index dae6c9a..0047ca6 100644
--- a/111.txt
+++ b/111.txt
@@ -1,2 +1,8 @@
 111
-111
\ No newline at end of file
+<<<<<<< HEAD
+111
+=======
+develop
+a_branch
+333
+>>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
diff --git a/doc/mll.txt b/doc/mll.txt
index 36dcc6c..0c57c35 100644
--- a/doc/mll.txt
+++ b/doc/mll.txt
@@ -1,2 +1,11 @@
 HI
-i'm mll
\ No newline at end of file
+<<<<<<< HEAD
+i'm mll
+=======
+<<<<<<< HEAD
+i'm mll
+=======
+i'm 20
+555
+>>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
+>>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
diff --git a/scr/scr.txt b/scr/scr.txt
new file mode 100644
index 0000000..deea31d
--- /dev/null
+++ b/scr/scr.txt
@@ -0,0 +1 @@
+NOTHING
\ No newline at end of file
diff --git a/src/src.txt b/src/src.txt
new file mode 100644
index 0000000..deea31d
--- /dev/null
+++ b/src/src.txt
@@ -0,0 +1 @@
+NOTHING
\ No newline at end of file