Restored a friendly relationship after a conflict or disagreement, or made two conflicting things consistent with each other.
From Latin 'reconciliare' meaning 'to bring together again,' composed of 're-' (again) and 'conciliare' (to unite or make friendly). The sense evolved from repairing relationships to resolving any kind of conflict.
In accounting, 'reconciling' bank statements means making two conflicting sets of numbers agree—it's the same word as making up after a fight because both require finding harmony between opposing forces.
Complete word intelligence in one call. Free tier — 50 lookups/day.