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