diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt
index ea16f16..bbf9277 100644
--- a/_test_data/sandbox/conflict/shared.txt
+++ b/_test_data/sandbox/conflict/shared.txt
@@ -1,4 +1,4 @@
 conflict scenario
-owner: sandbox-conflict-base
-resolution: parent branch version
-marker: 00e3fde
+owner: sandbox-conflict-child
+resolution: child branch version
+marker: 985bb77