Squirrel / Splash NewsDid Lorde and Diplo kiss and make up?
It's looking that way, according to some photos that were snapped of the pair getting quite cuddly after the 2016 Brit Awards on Wednesday.
In case you missed it, in November 2014, the famous DJ made waves when he requested that someone make a kickstarter to "get Taylor Swift a booty." Well, of course someone took the suggestion seriously and created an online campaign in order to raise funds for Swift's butt implants, which Diplo subsequently promoted via Twitter.
Obviously, this lead to uproar out of Swift's massive fan following, but it was her bestie Lorde's comment that really took the feud to another level. The "Royals" songstress responded on Twitter: "@Diplo should we do something about your tiny penis while we're at it hm."
The DJ decided to respond by poking fun at Lorde's age, saying, "The moment u realize she's a high school student," and later adding, "Disappointed the swift boat veterans didn't get my tiny dick a fundly going (enlarge me bae )."
All of the drama eventually came to a not-so-swift (pun intended) end months later when TayTay and Diplo snapped a selfie together at a 2015 Grammys after-party, proving they shook off the minor feud and moved forward.
However, Lorde and Diplo never made public amends...until now, that is.
Perhaps it was Lorde's incredible David Bowie tribute or maybe it was just the amount of alcohol consumed throughout the evening, but it appears the 2016 BRITS made the perfect opportunity for the pair to kiss and make up.
They smiled as photogs captured them embracing one another and cozying up together as they made their way to an after-party, proving there's definitely no more drama here!