Conor McGregor-Nate Diaz 2 is back on.

UFC announced Saturday night that the two MMA stars will face off at UFC 202 on Aug. 20 in Las Vegas.

Diaz stunned mixed martial arts fans at UFC 196 in March when the welterweight forced McGregor, who had come up in weight, to submit in the second round of their fight. And after the success of their first bout, it was no surprise when the rematch was scheduled for UFC 200. However, McGregor was taken off the card when he refused to do some promotional work for the event.

But any issues apparently were resolved, and the rematch UFC fans have been waiting for will take place this summer, just one month later than originally planned.

Thumbnail photo via Mark J. Rebilas/USA TODAY Sports Images