The two were forced to squash the beef.
The long-running feud between Taylor Swift and Kim Kardashian was publicly squashed recently, when Kim went on Watch What Happens Live With Andy Cohen. During a segment called "Squash That Beef" Cohen asked her, as she sat between her two sisters, if the beef with Swift was ongoing. She did not take the "stove on my waist turn beef to patties" route, but rather she said, between sips on her cocktail straw, that she's "over it."
Although Kim brushed it off on the talk show, the beef-squashing apparently has its source in Taylor Swift's recent record deal with Universal Music Group, which also owns E!, the network on which Keeping Up With The Kardashians airs. As the Daily Mail has it, Kim was "told by the bigwigs" that she had to end the animosity because, as Drakesays, "nobody eats when the family feuds" and they are now, at least in a corporate sense, family.
Although the beef began between Kanye and Swift when he interrupted her at the VMAs to deliver a powerful truth to the crowd ("Beyonce had one of the best videos of all time"). Since then, there's been a consistent vanilla outrage directed at Ye, which has only grown especially after he declared that "I feel like me and Taylor might still have sex" on "Famous." That outrage was brought down upon Kim when she posted a recording of Swift giving Kanye her blessing to use the line. Watch the "Famous" video: