diff --git a/111.txt b/111.txt
index b274956..0047ca6 100644
--- a/111.txt
+++ b/111.txt
@@ -1,4 +1,8 @@
 111
+<<<<<<< HEAD
+111
+=======
 develop
 a_branch
-333
\ No newline at end of file
+333
+>>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
diff --git a/doc/mll.txt b/doc/mll.txt
index 7f309fa..0c57c35 100644
--- a/doc/mll.txt
+++ b/doc/mll.txt
@@ -2,6 +2,10 @@ HI
 <<<<<<< HEAD
 i'm mll
 =======
+<<<<<<< HEAD
+i'm mll
+=======
 i'm 20
 555
 >>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
+>>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
diff --git a/wbb666.txt b/wbb666.txt
new file mode 100644
index 0000000..32ea6b5
--- /dev/null
+++ b/wbb666.txt
@@ -0,0 +1,2 @@
+wbb good and wonderful
+111
\ No newline at end of file