Describir: Understanding conflict resolution