diff --git a/fork test.txt b/fork test.txt
new file mode 100644
index 00000000..ddcd23bc
--- /dev/null
+++ b/fork test.txt	
@@ -0,0 +1,10 @@
+much wow
+double wow
+<<<<<<< HEAD
+triple baby
+hey message
+321
+is this thing on?
+=======
+triple baby
+>>>>>>> parent of e73f13d (hey)
diff --git a/text2.txt b/text2.txt
new file mode 100644
index 00000000..b6faea73
--- /dev/null
+++ b/text2.txt
@@ -0,0 +1,6 @@
+wow again
+
+love
+
+death
+