After McGregor became irritated with having to promote the fight, he was kicked out of UFC 200 against Diaz.
On the other side, Diaz said he would not fight anyone other than McGregor.
Luckily for UFC fans, the two were able to make peace with the promoters and the hyped rematch is back on.
The Irish fighter and the undefeated boxer were teasing fans with the possibility, but it never really seemed likely.
UFC commissioner Dana White told ESPN earlier this week that Mayweather's camp had not contacted him, which he would need to in order to make that fight become a reality.
Diaz and McGregor fought in UFC 196 where Diaz won, surprising the UFC community.