As fans know, Kim, Khloe, andKourtney Kardashianplayed a round of a game called "Squash That Beef!" on Monday (January 14) and revealed that for the New Year they're moving past all their past feuds — except with one rapper. Andy came out the gate swinging, immediately asking if Kim's 2016 beef withT- Swift had been squashed. "Over it," she replied. "I feel like we've all moved on."

Things weren't as quite cut and dry when Drake's name came up in a later game. After Kourtney deferred a question during "Plead the Fifth," Andy asked Kim who'd she rather be stuck in an elevator with Taylor or Drake, and she did not hesitate in choosing T-Swift. Kim's decision seemingly makes sense, given her over two-year-oldfeud with Tay has had time to settle. While her feud with Drake is still kind of brewing — yikes! (Get caught up on Kim's feud with Drake HERE)

Back in 2016, Kim leaked clips of a call between Taylor and her husband Kanye West, as proof that Taylor approved his "Famous" lyrics about her. See, shortly after the song came out, Taylor claimed Kanye never told her he was calling her "that b*tch,” and even shaded him in an entire acceptance speech. So, Kim's posting of the videos to Snapchat just added more fuel to fire, causing the "End Game" singer to hit back at Kim on Instagram. "You don’t get to control someone’s emotional response to being called 'that b*tch' in front of the entire world," she wrote. "He promised to play the song for me, but he never did." Since then both ladies have taken sly shots at each other over the years. However, it seems they've finally found peace.