diff --git a/conflict b/conflict
new file mode 100644
index 0000000..7cd2517
--- /dev/null
+++ b/conflict
@@ -0,0 +1 @@
+This will conflict