fix: Resolving merge conflict

app/client/packages/design-system/ads/src/List/List.tsx

@@ -11,9 +11,6 @@ import {
   TooltipTextWrapper,
   TopContentWrapper,
 } from "./List.styles";
-import type { TextProps } from "../Text";
-import { Text } from "../Text";
-import { Tooltip } from "../Tooltip";
 import {
   ListClassName,
   ListItemBDescClassName,
@@ -22,6 +19,9 @@ import {
   ListItemTextOverflowClassName,
   ListItemTitleClassName,
 } from "./List.constants";
+import type { TextProps } from "../Text";
+import { Text } from "../Text";
+import { Tooltip } from "../Tooltip";
 
 function List({ className, items, ...rest }: ListProps) {
   return (