Conflict resolution focuses on finding a solution to a disagreement or conflict between two or more parties, whereas conflict management involves handling conflicts in a way that minimizes their negative impact and fosters positive outcomes. Conflict management skills can include conflict resolution, as well as techniques for preventing conflicts and maintaining a harmonious environment.