It looks like M.I.A and Diplo have squashed their beef and hashed out their differences in order to make new music. The two used to date and make hits and once things went south, there was a ton of back and forth throughout the years. But ahead of the release of M.I.A's new album, which is supposedly out on September 9, the two will deliver their collaborative single 'Bird Song' on August 12.