If you missed it, Lorde and Diplo’s feud first broke the internet back in 2014 when the American DJ posted a crowdsourcing link to Twitter requesting to “Get Taylor Swift A Booty”.
The jerk move caused New Zealand songstress Lorde, who also happens to be Swift’s BFF, to put Diplo (real name Thomas Wesley Pentz) in his place by commenting on his pee-pee (or lack thereof).
However, it seems they've finally kissed and made up after they were photographed looking mighty cosy together at Justin Bieber’s Brit Choice after-party in London on Thursday night.
The 19-year-old opened up about the tiff in an interview last year saying that she hopes the beef is behind them, describing her relationship with Diplo like that of a brother.
"I think often I say things and realise that Americans hear what I say differently to how I hear it," she told The Fader in November 2014. "I love Wes and he's a big brother to me and one of my first friends in the industry, and part of having a friendship with someone like that is not letting them say stupid shit. Taylor's my friend as well, and I'm a girl, and if I see some weird body-shaming on my feed I'm going to be like, 'Hey man ... ' We do still love each other, hopefully."
And it sure looked that way following the Brit Awards. Hand-in-hand, with Diplo’s arm around her waist it appears Lorde has put his childish ways behind them -- and may even count the Los Angeles-based producer as a little more than just a "brotherly" friend.
Either way, we're confident the "Team" singer who reportedly split with her long time boyfriend in January has schooled Diplo in the body shaming thing. It's pretty simple, just don't do it.
Lorde was praised for her performance earlier that night when she paid tribute to David Bowie with a rendition of "Life On Mars."
Fans and celebrities including Bowie's son, Duncan Jones, applauded Lorde for her heartfelt performance.