#425 was squash-merged, so #426's base content now lives in main under a
different SHA. Reconciled the three resulting conflicts:
- .github/workflows/test.yml: kept #426's superset test list (its unification
suites plus test_element_style.py); main had only element_style from #425.
- CHANGELOG.md: kept #426's version, which promotes main's "Unreleased"
section into the "3.2.0" release and is a verified superset of main's
content (no lines dropped).
- test_sports_base_characterization.py: kept #426's side for all three blocks.
Two are semantic, not cosmetic: #425 pinned the pre-fix behaviour
(hockey/baseball events dropped -> *_returns_none), while #426 carries the
actual fixes (2486bdb2, 2eea7a7f) and updated the tests to *_still_extracts.
Taking main's side would fail against #426's fixed code. The third is the
get_background_service import path, which is .core in #426 after the package
split. Also refreshed a stale comment that still named the removed test.
#424's global_config plumbing merges in cleanly; verified the interlock end to
end on the merged tree (global_config target_fps -> SportsScrollDisplay 90.0).
435 tests pass across the affected suites; the lone failure
(test_get_system_status) is one of the four pre-existing on main.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KEZK1P1Q1fu5pcuVrkrCFZ
