Kim Kardashian and Calvin Harris came together to celebrate Jennifer Lopez's birthday on Saturday.
Sources told People Kardashian and Harris were "friendly" and chatted together at the bash.
The reality star and DJ both appear in a photo rapper French Montana shared on Instagram.
Kardashian and husband Kanye West are feuding with Swift over West's song "Famous," which includes the controversial lyric "I made that [expletive] famous."
Kardashian released a secretly recorded conversation between West and the singer last week after claiming Swift approved the line.The "Keeping Up with the Kardashians" star added fuel to the fire prior to Lopez's party by sharing a Snapchat video of herself singing "Famous."
The clip sees Kardashian and her friends sing along to the controversial lyric.
"Hurtful to me at this point that her and her team would go so far out of their way to try and make me look bad," the DJ tweeted after Swift's rep confirmed the singer's role this month.
He was later spotted wearing sneakers from West's Yeezy line.