Future and Drake have settled their differences and will hit the road together after all. After their public fallout, Future has announced that he is back on Drake’s tour.

Earlier this week, Page Six reported that Drake had kicked Future off the tour after reading an unfavorable interview on Billboard.com, in which he criticized Drake’s album Nothing Was the Same.

Future was reportedly gearing up to file a lawsuit against Drake for lost wages in the amount of $1.5 million ($40,000/show).

But it looks like he won’t need to take legal action. On Wednesday, Atlanta radio station Hot 107.9 reported that the rappers had resolved their issues and Future would remain on the bill.

Future confirmed the news, tweeting, “Back in Atl getting ready for tour..1st stop Pittsburgh.”

The 39-city “Would You Like a Tour?” trek kicks off Friday in Pittsburgh with the original lineup including Miguel.

Drake’s OVO signee PARTYNEXTDOOR and Jhené Aiko are among the supporting acts.