Also clarify for contacts
Improve conflict_resolution docs