cured the beef

When you’re at odds with someone or something but you find a way to work it out.

“T. Swift & Kim K. used to be enemies but they cured the beef.”