There are many ways to repair a relationship, whether it's extending an olive branch, or by striking a bargain, or by making a good friend feel like just that