#smoothing things over #conflict resolution #easing tension #social smoothing #making peace