diff --git a/config/conflict.txt b/config/conflict.txt
index 8082e11..180b47c 100644
--- a/config/conflict.txt
+++ b/config/conflict.txt
@@ -1 +1 @@
-master selects fixture B
+baseline