M.I.A. has shared a second version of her song “Bird Song” from new album AIM, this time produced by Diplo. Earlier this month she shared a version of the song produced by Blaqstarr; both tracks are set to appear on the album, according to the latest tracklist.

Diplo and M.I.A. were professionally and personally linked for years — he produced some of her biggest hits like “Paper Planes” — but they had a falling out that halted their collaborations in recent years. “Bird Song” marks their first joint project since 2010’s Maya.

“I think on a professional level, [Diplo] has like sort of done everything he needs to do, so his ego is not challenged when he works with me,” M.I.A. recently told EW about working with the producer. “To me, it was really important to be like, you can like make amends. And that is what the record is about. It’s sort of about that journey and it’s about making amends and just being like comfortable with what everything is.”

Diplo isn’t the only big-name guest on AIM; the album also notably features a collaboration with ex-One Direction member Zayn Malik.

“I really wanted to write a song for Zayn,” M.I.A. told EW. “We had a couple people in common. And that’s how it came about. I didn’t really approach him for my own record until later on. First, I thought I wanted to try writing a song for him.”

Listen to Diplo’s remix of “Bird Song” below.