Conflict management is dealing with conflict in either a confrontational, non-confrontational, or cooperative way.
Conflict management refers to the ability of identifying and handling conflicts in a sensible, fair, and efficient way. This process limits the negative aspects of conflict while increasing the positive aspects of conflict. Its purpose is to improve learning and group outcomes.
Conflict resolution entails reducing, eliminating, or finishing all forms and types of conflict.