Taylor Swift and Diplo put their recent feud behind them by partying together after the Grammy Awards on Sunday night (08Feb15).

The singer appeared to fall out with the Dj/producer online after he made a joke about Swift's body shape, prompting pranksters to launch an Internet campaign to raise funds to buy the Love Story star a new "booty".

Pop star Lorde waded into the furore by flinging insults at Diplo, and the Dj later admitted he received a slew of death threats and disturbing messages from Swift's fans at the height of the feud.

However, the pair mended the rift on Sunday night when they got together at a Grammy Awards afterparty. Diplo posted a picture of himself posing with Swift on his Instagram.com page, adding in a caption, "Then this happened... #grammys2015."