diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt
index f53ef9b..ea16f16 100644
--- a/_test_data/sandbox/conflict/shared.txt
+++ b/_test_data/sandbox/conflict/shared.txt
@@ -1,4 +1,4 @@
 conflict scenario
-owner: sandbox-trunk-drift
-resolution: trunk drift version
-marker: 44caee2
+owner: sandbox-conflict-base
+resolution: parent branch version
+marker: 00e3fde