Fix merge conflict

Author: KacperFKorban

scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala

@@ -119,7 +119,7 @@ trait TypesSupport:
       case AnnotatedType(tpe, _) =>
         inner(tpe, skipThisTypePrefix)
       case FlexibleType(tpe) =>
-        inner(tpe)
+        inner(tpe, skipThisTypePrefix)
       case tl @ TypeLambda(params, paramBounds, AppliedType(tpe, args))
         if paramBounds.forall { case TypeBounds(low, hi) => low.typeSymbol == defn.NothingClass && hi.typeSymbol == defn.AnyClass }
         && params.length == args.length