Conflict text

Changes to the placement of contributor conflict xref, altered default text for multiple conflicts, and change order of conflict printing in back matter.