Definition: find a solution or answer to a problem or conflict
Examples: Maria resolved the conflict between her friends by calmly discussing their differences. | The mediator helped the two parties resolve their conflict through open communication and compromise.