Smooth over
Definition 1 of 1
Pro Tip 1/3Conflict Resolution
Use 'smooth over' when trying to resolve minor conflicts or ease tensions, not just fix problems. 
He gave her flowers to smooth over their argument.
Pro Tip 2/3Temporary Solution
'Smooth over' often implies a temporary fix, not a permanent solution. 
Saying sorry just to smooth over the issue won't work long-term.
Pro Tip 3/3Not Just Words
Actions, as well as words, can 'smooth over' a situation. 
They changed the subject to smooth over the awkward silence.