[antir-heralds] Conflict Question

[Britt]

I hit return early, but Basil ran a perfectly competent conflict check
so it doesn't matter.  However, I shall sign off...

- Teceangl