The rematch is on. Conor McGregor vs. Nate Diaz at UFC 202 has been officially announced by the organization during Saturday's pay-per-view. The fight will take place at the T-Mobile Arena in Las Vegas, Nevada.

With Diaz in attendance for the California event and rumors swirling earlier in the day, the company made the Aug. 20 UFC 202 main event official after Dan Henderson scored a knockout victory over Hector Lombard. The announcement came via this trailer video.

Diaz beat McGregor via guillotine choke at UFC 196 in March after taking the fight on short notice. The rematch was originally scheduled to take place at UFC 200 as the main event, but issues for McGregor coming to the United States from Iceland during his training camp prompted Dana White to pull him from the card, leaving the two sides in what McGregor called a "publicized civil war."

McGregor even flirted with the idea of fighting retired boxer Floyd Mayweather instead of taking on Diaz for a rematch. But after saying he regretted not getting on the flight to the press tour for 200, it seemed like only a matter of time before the fight with Diaz would happen.

It took two months to get squared away, but it appears the two sides have come to an agreement.

It's on ... again. USATSI