What dictionary has to say about

kiss and make up