The act of reconciling two people or groups who disagree.
"In the flowing style of ink and grace"
"At the Airport"