Conor McGregor will return to the UFC when he takes on Khabib Nurmagomedov at UFC 229 on October 6.