kiss and make up

Verb

 * 1)  To settle one's differences and forgive.