Describir: Conflict resolution :