The act of reconciling two people or groups who disagree.
"From cover-up to cover story"
"Under the Weather"