diff --git a/mergetest.txt b/mergetest.txt
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ b/mergetest.txt
@@ -0,0 +1 @@
+test