Original: Conflict management is often considered to be distinct from conflict resolution.
Simplified: Conflict resolution is a set of ideas and ways to reduce sources of conflict. The term "conflict resolution" is sometimes used interchangeably with the term "dispute resolution".