kiss and make up

If Charter and Disney don’t kiss and make up, the rest of the pay TV industry will get a look at exactly what happens when a publicly traded cable company loses the channels that have become synonymous with U.S. sports.

“We also think you and Tim should kiss and make up,” says Emily.

Judging by what's happened since, this was no "kiss and make up".

“Now, we’re trying to kiss and make up.”

“We have occasional rows and occasional splits and we come together and kiss and make up.”