What does conflict resolution include?

Conflict resolution could include sitting down together and talking through a problem, going to counseling, reaching a compromise, etc.