#smooth things over #resolve conflict #calm discussion #ease tension #reconcile #mediate