It looks like Nate Diaz got his wish, he asked for the UFC to book his teammate Chris Avila vs one of Conor McGregors teammates and the UFC obliged him. Chris Avila will face Artem Lobov at UFC 202, check it out.
UFC 202 Card:
Nate Diaz vs Conor McGregor
Anthony Johnson vs Glover Teixeira
Donald Cerrone vs Rick Story
Dong Hyun Kim vs Neil Magny
Cody Garbrandt vs Takeya Mizugaki
Chris Avila vs. Artem Lobov