Whether or not the tension has been resolved remains to be seen, but Rick Ross, Wale and Meek Mill reunite on the Self Made 4 single “Make It Work.” 

https://soundcloud.com/maybach-music-grp/make-it-work