The conflict dialogs now say conflict throughout, so the code says it
too. The attr source :clash becomes :conflict, clash-attrs becomes
conflicting-attrs, hidden-clashes becomes hidden-conflicts, text-clash?
becomes text-conflict?, the row class is-clash becomes is-conflicting,
and the message keys resolve.tag.clash and resolve.tag.clashes become
resolve.tag.conflict and resolve.tag.conflicts. The tests and their
names follow, and the tag documentation now cites keys that exist.
AI-assisted-by: claude-opus-5-5
30274b5320