diff --git a/t1/test.txt b/t1/test.txt
new file mode 100644
index 0000000..262f4cc
--- /dev/null
+++ b/t1/test.txt
@@ -0,0 +1,67 @@
+foo
+foo
+foo
+foo
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bla
+bla
+<<<<<<< HEAD
+bar
+bar
+bla
+=======
+>>>>>>> parent of 73942cd (update)
+bla
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+
+{{ foo | lorem: w }}
+7WODKNQeAVwbDJJl082Sg
+mc4oHCfEsY0tO0VLq4H1x
+DKH3McxpUM4yamo8lNako
+KqldfmpAxXR6cDeg4I49l
+dwVQUXipj1jV3om1ktBvI
+gVd9lam93Jo69zSokD0mG
+KjPzIPTbx1xs9PixlvDgC
+NgkBs3kdcm0GycRR2eWtr
+TnRaNtWwt28ao9N72jYCg
+cgAwdayYMrxNOwep3Iv1V
+z2XmqCJ6xQSErKIX000u4
+TZK0rCn3I3GiEnKashIOr
+mzAAjfjkz1tqXqpKpTs0y
+6BuxINcvFigGZHdPsT1u0
+xWACZys7idqsEkX0bvrPq
+ytL2DzwiA22jAsYvCJb0E
+R0ru3r1OZB6QZKdF44l5D
+6yvlEOrQJNcy98NLVSAQk
+0HLf6c2JBtJRb6EuKYekH
+MTLxkP0vFW0YXkrhHIOXI
+IVr960l1A5rQuj4ZBS1ZY
+faZoHYz7wS1crngedjQkk
+hmJjO2PrknsPh9m6bGVEK
+kBLfsxOB233y89KnJxF8n
+OzCR6h6a6M02d2XXFh8H4
+lxcEaRG5FsOOPp02qNKYL
+r2K2jARvAEe4Yqurgiy6L
+Slk1tiDiuRV4adrrMz0VH
+r49aePjvTqeyvZpV0I7kp
+75i3rKkOwELWUFkE8XOQe
+r0P62fa7dDHn0CoOapa9R
\ No newline at end of file
diff --git a/trash2/test.txt b/t2/test.txt
similarity index 100%
rename from trash2/test.txt
rename to t2/test.txt
diff --git a/trash3/somedir/foo.txt b/t3/somedir/foo.txt
similarity index 100%
rename from trash3/somedir/foo.txt
rename to t3/somedir/foo.txt
diff --git a/trash3/test.txt b/t3/test.txt
similarity index 100%
rename from trash3/test.txt
rename to t3/test.txt