Without Merlin, there would be no Gandalf, so I see them as the same thing, one a continuation of the other.