UFC featherweight champ Conor McGregor will move up two weight classes to take on Nate Diaz in a non-title fight in UFC 196, an event that also features Holly Holm's defense against Miesha Tate.