It’s been six long years since former lovers turned enemies M.I.A. and Diplo worked together, but it appears they’ve buried the hatchet. Back in M.I.A.’s good graces after their very public falling out — “He basically just like shat on every good thing that was happening to me,” she once said of their relationship — Diplo has remixed M.I.A.’s “Bird Song” for her upcoming (and possibly final) album, AIM. Blaqstarr’s remix is also on the album, but needless to say, Diplo’s bangs harder. By M.I.A.’s account, it’s a miracle we’re even hearing it; she posted on Instagram that her label had been withholding permission to release the song. But M.I.A.’s love for bird metaphors cannot be caged! Drop down, get your eagle on.