Merge pull request #14 from hack-dance/sandbox-trunk-drift

sandbox: trunk drift

Author: roodboi

_test_data/sandbox/conflict/shared.txt

@@ -1,4 +1,4 @@
 conflict scenario
 owner: sandbox-trunk-drift
 resolution: trunk drift version
-marker: bd5bf7e
+marker: 398f525