reconcile

To become friendly again after a fight or disagreement.