Settle one's differences, reconcile, as in The two friends decided to kiss and make up. This colloquial expression has largely replaced kiss and be friends, dating from the 1400s. [Mid-1900s]
