diff --git a/merge-test b/merge-test
new file mode 100644
index 0000000..38a2818
--- /dev/null
+++ b/merge-test
@@ -0,0 +1 @@
+woah