
Smooth over
Conflict Resolution
Use 'smooth over' when trying to resolve minor conflicts or ease tensions, not just fix problems. 
Temporary Solution
'Smooth over' often implies a temporary fix, not a permanent solution. 
Not Just Words
Actions, as well as words, can 'smooth over' a situation. 