McGregor and ex-sparring partner settle dispute over whiskey brand

McGregor say he is happy matter is resolved and can now focus on training ahead of upcoming fight this summer