reconciled

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