diff --git a/config/conflict.txt b/config/conflict.txt
new file mode 100644
index 0000000..180b47c
--- /dev/null
+++ b/config/conflict.txt
@@ -0,0 +1 @@
+baseline