Clarify conflict resolution