To reconcile means to return to a friendly relationship.
After arguing, the two friends were reconciled with each other.