Yesterday Pete Rock went on a Twitter rant about Lupe Fiasco’s new single,”Around My Way (Freedom Ain’t Free)”, which samples Pete Rock’s “T.R.O.Y.”

Lupe Fiasco was confused by it, but now the two have resolved what seem to be a misunderstanding and plan to do a collaboration.

Pete Rock tweeted, “I just got off da phone lupe, we worked out our differences and we bout to get it in. Gonna be epic and we gonna give Troy and hev the… Proper respect they deserve and make history with lupe.”

Lupe tweeted, “Shout to the Friends&Family for bringing some internal closure to this…all g on this side Pete…Big Chuck whaddup…#MyGodFoRealListen”