diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..b27fa28
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1 @@
+banane
\ No newline at end of file