Conflict resolution involves the reduction, elimination, or termination of all forms and types of conflict. ... Conflict management minimizes the negative outcomes of conflict and promotes the positive outcomes of conflict with the goal of improving learning in an organization.
