They should kiss and make up