diff --git a/CONFLICT.md b/CONFLICT.md
index 90fa0b8..9f8e18e 100644
--- a/CONFLICT.md
+++ b/CONFLICT.md
@@ -1 +1 @@
-base v1
+head version