Popular DJ Diplo and singer/songwriter Taylor Swift made amends during the Grammy Awards this past Sunday after a very public feud that was plastered all over our Twitter timelines. The beef all started after Diplo, who was rumored to be dating Katy Perry at the time, tweeted a mean message to his followers that said, “Someone should make a kickstarter to get taylor swift a booty” back in November, including a link to an actual Kickstarter page (which raised $45 for Taylor’s booty injections). Being the good friend that she is, artist Lorde came for Diplo’s jugular and tweeted to him, “@diplo should we do something about your tiny penis while we’re at it hm.” Luckily for the Pop/Dance world, all sides are now buddies again after T. Swift and Diplo flicked it up together at the Grammys. He posted up the photo to his Instagram page captioning it, “Then this happened @taylorswift vs taylor spliff #grammys2015.” We are overjoyed to see these two burying the hatchet and becoming buddies again. See the whole ordeal between Diplo vs. Taylor Swift/Lorde over in the gallery. My money was on Lorde anyways. She looks like she does NOT play around!