reconciliation, making up (with), making peace (with), being friends again, patching up a quarrel