diff --git a/doc/mll.txt b/doc/mll.txt
index 751fe55..7f309fa 100644
--- a/doc/mll.txt
+++ b/doc/mll.txt
@@ -1,3 +1,7 @@
 HI
+<<<<<<< HEAD
+i'm mll
+=======
 i'm 20
-555
\ No newline at end of file
+555
+>>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
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