Fix merge issues

Author: mspirkov

src/DocBlock/StandardTagFactory.php

@@ -154,7 +154,6 @@ public static function createInstance(FqsenResolver $fqsenResolver): self
 
         $tagFactory->addService($descriptionFactory);
         $tagFactory->addService($typeResolver);
-        $tagFactory->registerTagHandler('mixin', $phpstanTagFactory);
         $tagFactory->registerTagHandler('param', $phpstanTagFactory);
         $tagFactory->registerTagHandler('var', $phpstanTagFactory);
         $tagFactory->registerTagHandler('return', $phpstanTagFactory);