SOLVING CONFLICTS