Young Thug and Rich Homie Quan have had their differences before, but it appears that they’ve resolved their differences for Thugger’s upcoming project.

Thug’s upcoming album E.B.B.T.G. (Easy Breezy Beautiful Thugger Girls) is coming soon, and on Wednesday he unveiled the preview of a song that appears to have Rich Homie Quan on the record.

The two Rich Gang members fell out in 2015, with Thug calling Quan out of his name in multiple shows. But it appears that they have resolved their differences. Rich Homie Quan told HotNewHipHop as much in a recent interview.

“I’m on good terms with everybody,” he said. “We don’t have any bad terms, it’s just like, now we’re solo artists, you feel me? I think people forget that we were always supposed to be solo artists, we just happened to collaborate on a project. There was never supposed to be another project like that.”

Young Thug announced _E.B.B.T.G. (Easy Breezy Beautiful Thugger Girls)_ on April 26: the Covergirl-inspired title, that the album would feature him singing, and that it was executive produced by Drake. He is also performing on select dates of Future’s Nobody Safe Tour.

Young Thug will be performing at Miami’s Rolling Loud music festival May 5-7 which REVOLT TV will be exclusively live streaming here. Follow at #RollingLoud3 on Twitter.