diff --git a/trash2/test.txt b/trash2/test.txt
new file mode 100644
index 0000000..597bf7e
--- /dev/null
+++ b/trash2/test.txt
@@ -0,0 +1,32 @@
+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
+f
\ No newline at end of file