reconciled

RECONCI'LED, pp. Brought into friendship from a state of disagreement or enmity; made consistent; adjusted.