e15606fdbdc67305730ac9b2aaa8eeef91c9f1c8
100644 9438e65c214f6d4732deee1a86853713f6a62f49 1	docs/plans/original-completion-2026-10-02/execution/completion_marker_contracts.json
100644 2eecb803f5eb6774ff38cd353de1f02847aeb0f9 2	docs/plans/original-completion-2026-10-02/execution/completion_marker_contracts.json
100644 06b74d1d442f1e412dbbb39292ad18774a149bf2 3	docs/plans/original-completion-2026-10-02/execution/completion_marker_contracts.json
100644 5e0252dba4d44335d6d0e1721c0906d9eb1c91de 1	scenes/main/main.gd
100644 fff37f082d750bb91c71f2aa54d168c9e2cb8fe7 2	scenes/main/main.gd
100644 2adc769cb26d7e4163fa8b2f256b10d8034d4cb5 3	scenes/main/main.gd
100644 e1f5b0eb86b64b64216000c48d62e28555dc6536 1	scenes/main/world_preview.gd
100644 fa32fe0344d20565b6d542da1256a94e8dee1845 2	scenes/main/world_preview.gd
100644 5ebf3bd77a2cb114315ea6cb3ce03b47152ab7a0 3	scenes/main/world_preview.gd
100644 dd284aea52a6de48d5322048d5ad201342cd05e5 1	tools/regression/suite-policy.json
100644 ad194ae425fb8123fa191ed3635f404c098f692d 2	tools/regression/suite-policy.json
100644 b233e06a0cdacc18643df1b9de76c73b95dd850a 3	tools/regression/suite-policy.json

Auto-merging docs/plans/original-completion-2026-10-02/execution/completion_marker_contracts.json
CONFLICT (content): Merge conflict in docs/plans/original-completion-2026-10-02/execution/completion_marker_contracts.json
Auto-merging scenes/main/main.gd
CONFLICT (content): Merge conflict in scenes/main/main.gd
Auto-merging scenes/main/world_preview.gd
CONFLICT (content): Merge conflict in scenes/main/world_preview.gd
Auto-merging tools/regression/suite-policy.json
CONFLICT (content): Merge conflict in tools/regression/suite-policy.json
