The management of a conflict situation to arrive at a resolution satisfactory to all parties.
Conflict resolution is a wide range of methods of addressing sources of conflict - whether at the inter-personal level or between states - and of finding means of resolving a given conflict or of continuing it in less destructive forms than, say, armed conflict. Processes of conflict resolution generally include negotiation, mediation, diplomacy and creative peacebuilding. The term "conflict resolution" is sometimes used interchangeably with the terms dispute resolution or alternative dispute resolution. The processes of arbitration, litigation, and formal complaint processes through an ombudsman, are part of dispute resolution, and therefore they are also part of "conflict resolution."