fix: provide merge context to beta conflict resolver (#19055)

Parent: 0a80ef4

Committed by GitHub <noreply@github.com> on 3/25/2026, 4:45:37 AM