Conor McGregor and Mike Tyson squashed their feud and smoked weed together