fix: resolve leftover merge-conflict markers breaking analysis/__init__.py (main does not import)

[philluiz2323]

Type

• General improvement — bug fix, docs, refactor, or infrastructure (welcome but earns no TAO)

---

General improvement

What does this PR do?

main does not import. src/trinity/analysis/__init__.py carries unresolved merge-conflict markers — a botched 3-way merge of the oracle_column and definition_of_done additions — so import trinity.analysis raises:

SyntaxError: invalid character '§' (U+00A7)

and the entire test suite fails to collect (every test that imports trinity.analysis errors at import). This PR resolves the markers.

The three tangled import blocks are all legitimate, non-overlapping additions, so the resolution keeps all of them — union_diagnostics, oracle_column, and definition_of_done. Their names were already present in __all__ (that region had no markers), so no export changes were needed.

Why is it needed?

CI is red on main at collection time; nothing can be tested until the module imports. This restores the analysis package.

# before
$ python -c "import trinity.analysis"
SyntaxError: invalid character '§' (U+00A7)

# after
$ python -c "import trinity.analysis"   # OK

Checklist

• Tests pass: pytest tests/ — import trinity.analysis now succeeds and the previously-uncollectable analysis tests run again (e.g. test_ablations.py, test_ensemble.py, test_per_question_best.py — 36 passed in the affected slice). Before this PR they errored at collection with the SyntaxError above.
• Lint passes: ruff check src/ — clean on the changed file.
• Type check passes: mypy src/ (for changed files).
• New code follows existing style (only conflict markers removed; the surviving imports are the ones both PRs added).
• Public functions have docstrings and type annotations (n/a — imports only).

[minion1227]

Three PRs are waiting on this file

#415, #416 and #417 are all red solely on these conflict markers — none of them touches src/trinity/analysis/__init__.py, so the merge base is their only failing check. #412 is in the same position.

Useful context for whoever merges: five PRs carry this exact fix

This resolution is not contested. #402, #405, #407, #408 and #403 all rewrite src/trinity/analysis/__init__.py to the byte-identical result — every one of them is index 9916618..6865bc2 — the union resolution that keeps all three import blocks (union_diagnostics, oracle_column, definition_of_done) and repairs the stray paren.

#407 / #408 / #403 are already green, because they each touch this file for their own feature and resolved it along the way.

So there's nothing to arbitrate between the competing fixes — there is only one resolution in play. Merging any one of the five repairs main and turns the rest into no-ops on this file. The dedicated fix PRs (#402/#405) are the lowest-risk route since they change nothing else, but a green feature PR that carries the same resolution works just as well.