kiss and make up
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]
Dictionary.com presents 366 FAQs, incorporating some of the frequently asked questions from the past with newer queries.