To repair a relationship; to resolve an argument or fight; to make reparations or redress.
To resolve, or make up for, one's previous folly.