Good / Friendly
reconcile - To bring two or more people or groups into a state of harmony or understanding after a disagreement or conflict.

After a long argument, they managed to reconcile their differences and rebuild their relationship, realizing how much they valued each other.
reprieve - A temporary delay or suspension of a punishment or undesirable situation, often granted as a mercy or to allow for further consideration.

The condemned prisoner was granted a reprieve by the governor, to the great relief of both him and his family.