Solve a semantic merge conflict with two PRs that landed (#316)

Parent: 6df692f

Committed by GitHub <noreply@github.com> on 7/27/2026, 4:17:25 AM