Conor McGregor's almost two-year hiatus from UFC will soon be coming to an end.

The Irishman has rarely been out of the spotlight since his last venture into the Octagon, when he defeated Eddie Alvarez in November 2016.

Since then, he has swapped sports, losing to Floyd Mayweather in his first professional boxing match, before his infamous attack on Khabib Nurmagomedov's bus earlier this year.

That incident in New York not only landed him in legal trouble but also upped the ante with his Russian rival.

The pair will go head-to-head at UFC 229 on October 6 in Las Vegas.

Of all the people the Notorious might have counted on to fight his corner, Mayweather probably wasn't among them.

However, the 41-year-old knows better than anyone what it takes to overcome McGregor and he has warned Nurmagomedov that his opponent from last year is absolutely fearless.

Mayweather has a message for Khabib

"Conor's not gonna back down and he's not a scared fighter at all, win, lose or draw," Mayweather told TMZ.

"Conor's gonna come to fight. I don't really have a prediction because I've never seen the guy fight that's facing Conor McGregor - from what I know he's a hell of a guy that's on the ground - hell of a grappler - and he can wrestle.

"But, the fans want to see you stand up and fight. That's what the fans like to see.

"Conor McGregor, he's a tough competitor, like I said before Conor McGregor's not gonna back down from anyone, he's not scared, he's a warrior."

It appears then, that the bad blood between the two has calmed down considerably over the course of the last 12 months.

An offer for McGregor

Indeed, Mayweather even invited McGregor to train at his club rather than at the official UFC facilities.

"I know that UFC have got a training facility but we'd like for him to work out at the Mayweather Boxing Club," he added.

A generous offer from the former world champion and it will be intriguing to see if the MMA superstar takes him up on it.

McGregor will need all the help he can get given Nurmagomedov's unbeaten record after 26 fights.

There will be those within the UFC who would love to see him come unstuck and yet, there is no denying he is still the company's biggest attraction.

Do you think McGregor can beat Nurmagomedov? Have your say in the comments.