reconciliation

The act of making peace and fixing a broken relationship.