Conor McGregor-Nate Diaz II announced for UFC 202

Conor McGregor and Nate Diaz will be getting it on in the Octagon once again.

The UFC announced during its UFC 200 show in Inglewood, Calif. on Saturday that McGregor and Diaz will fight for the second time, this time around at UFC 202 on Aug. 20.

The upcoming fight between them is the culmination of quite a saga.

To start with, Diaz was a late replacement for Rafael dos Anjos at UFC 196 in March. His addition to the fight card led McGregor to jump up to welterweight, which he later blamed his loss on. Then the two were set to meet at the UFC 200 show for a rematch, but that was cancelled after the UFC said McGregor refused to fulfill his media obligations.

Despite the dispute between McGregor and the UFC, which involved McGregor threatening his retirement, Dana White mended matters and met with both fighters recently. White’s publicized meetings with both led many to expect a fight would soon be announced.