ed2294875b
Resolve conflicts: - globals.css: keep origin/main disabled opacity 1 (BUG-140 parity) - consultation-entrypoint.test.ts: keep origin/main sticky-hover + disabled rules - BUG_HISTORY.md: keep origin/main BUG-139 (staging admin), renumber local Python prework fix to BUG-158