During the now infamous world wide press tour, Floyd Mayweather constantly brought up Conor McGregor’s previous loss in the UFC. The Irishman was forced into submission in the second round by a fighter named Nate Diaz. No other fighter has been able to beat McGregor during his UFC tenure.

Though McGregor avenged the loss with a unanimous decision victory over Diaz, the beef is by no means squashed.

It’s no surprise that Diaz has sided with Mayweather and might even walk out with Floyd come fight night.

“I’m from Stockton, California, and I was just in London with Floyd when the whole sh** went down with Conor and I’m going to make a call to Nate Diaz. I would love to see him walk out with Floyd. That would be awesome for the town,” said Jason Lee, a member of Mayweather’s Money Team, according to TMZ.com.

Diaz is known for representing his native town of Stockton but more importantly, he is also constantly bringing up the fact that he choked out McGregor.

“He’s from Stockton, we’re from Stockton, Stockton people are almost on the level of a Ferrari. We’re going to keep doing what it takes to stay relevant,” said Lee.

Mayweather and McGregor will settle it all on August 26th at T-Mobile Arena in Las Vegas, Nevada.