iron out
To discuss and reach an agreement about (a difference); find a solution for (a problem); remove (a difficulty).
The company and its workers ironed out their differences over hours and pay.
The House and Senate ironed out the differences between their two different tax bills.