iron out vs redeem oneself

To resolve (a dispute); to solve (a problem). 

To remove (a crease or creases) with an iron. 

To resolve, or make up for, one's previous folly.