Former two-division UFC champion Conor McGregor targeted a familiar foe for his planned fighting return later this year.