Kiss and make up

To become friends again after a fight or argument.

After they had a fight, the couple was quick to kiss and make up.