UFC superstar Conor McGregor gave welterweight titleholder Islam Makhachev rare praise after years of bad blood with him and his team.

Conor McGregor will return to the Octagon this weekend against Max Holloway at UFC 329. In a welterweight bout against the former BMF titleholder, McGregor will make his first walk to the Octagon in five years.

A win at UFC 329 could potentially result in a controversial welterweight title shot for McGregor. UFC CEO Dana White hasn’t explicitly ruled out granting McGregor a title shot after UFC 329, despite his low activity level in recent years.

That could set up a matchup between McGregor and his biggest rival, Khabib Nurmagomedov’s top protege Islam Makhachev. Makhachev won the UFC welterweight title at UFC 322 last year, becoming the UFC’s latest two-division champ.

Despite years of bad blood between McGregor and Team Khabib, Makhachev admitted that McGregor’s return is a positive addition to MMA. McGregor, who hasn’t exactly blanketed Makhachev with praise during his absence, gave Makhachev rare credit for his accomplishments.

Conor McGregor pushes Islam Makhachev against retirement: “There’s a lot left!”

In a recent interview with Complex, McGregor was asked to rank Makhachev amongst the greatest fighters of all time, and showered his biggest rival’s protege with surprising praise.

“Tremendous body of work in both divisions, for sure he is [in the GOAT conversation],” McGregor said of Makhachev.

“Still in it, still at it, but there’s a little bit of…people are impressionable, and people around him are talking to him about [retiring]. But there’s a lot left in that boy, and he should recognize that and keep going.

“I have him above both of his teammates [Daniel Cormier and Khabib Nurmagomedov].”

Makhachev returns to the Octagon next month against Ian Machado Garry at UFC 330 in his first welterweight title defense. If McGregor and Makhachev are both victorious, don’t be surprised if the matchmakers attempt to put together one of the biggest fights in UFC history.

What is your prediction for Conor McGregor vs. Max Holloway 2? Let us know in the comments!