Search
to resolve a situation or make amends for a mistake or wrongdoing
iron out
straighten out
to correct or fix something that is wrong or not in the proper condition
