Move contrib conflict xref outside of the aff tag.