#9 Enhance conflict view

Opened by Lale on Nov 1, 2026, 11:17 PM
Approve the patches, then land them on main with: