Override default conflict text if author conflicts exist.
Re-jig conflict text in back matter.
Move contrib conflict xref outside of the aff tag.
Merge pull request #104 from gnott/conflict-text

Conflict text