to settle (a dispute out of court) · to reconcile · settlement · conciliation · to become reconciled

Now shake hands and make up.

They made up and became friends again.

Our on-line Customer Service Desk and trained support agents enable problems to be quickly identified and addressed.