resolve

Definition

To find a solution to a problem or settle a dispute.

Example

"The mediator helped resolve the conflict between the two neighbors."