diff --git a/CONFLICT.md b/CONFLICT.md
new file mode 100644
index 0000000..90fa0b8
--- /dev/null
+++ b/CONFLICT.md
@@ -0,0 +1 @@
+base v1