Gilbert Melendez has said that Nick Diaz is back in training and says he would love to see a Team Diaz vs Team McGregor contest.