Today has been a giant day in UFC news, with the rumors of Brock Lesnar's return, as well as the big UFC 199 card. The news didn't stop rolling throughout the card, as the Conor McGregor vs. Nate Diaz re-match was made official.

The two will square off at UFC 202 on August 20 from Las Vegas. This comes after extended negotiations and breakdowns in negotiations from both sides. Diaz originally defeated McGregor at UFC 196 in March.

The two were set to re-match at UFC 200 until Conor McGregor was pulled from the show for not fulfilling media obligations. After McGregor came to an agreement with the UFC, Diaz then had a negotiation with the company that went south, before ultimately being fixed this weekend.

Follow Sean Ross Sapp on Twitter at @SeanRossSapp. Got a news tip or correction? Send it to us by clicking here.