kiss and make up 大和解

kiss and make up  (humorous)

if two people kiss and make up, they stop being angry with each other and become friendly again Ian and I used to fight a lot, but we always kissed and made up afterwards.