Resolve merge conflicts

Signed-off-by: AmbrishRamachandiran <ambrish.r@infosys.com>

docs-ui/src/utils/data.ts

@@ -85,10 +85,6 @@ export const components: Page[] = [
     title: 'RadioGroup',
     slug: 'radio-group',
   },
-  {
-    title: 'SearchAutocomplete',
-    slug: 'search-autocomplete',
-  },
   {
     title: 'SearchField',
     slug: 'search-field',

packages/ui/report.api.md

@@ -1162,6 +1162,7 @@ export const FieldLabelDefinition: {
     readonly description: {};
     readonly htmlFor: {};
     readonly id: {};
+    readonly descriptionId: {};
     readonly className: {};
   };
 };
@@ -1173,6 +1174,7 @@ export type FieldLabelOwnProps = {
   description?: string | null;
   htmlFor?: string;
   id?: string;
+  descriptionId?: string;
   className?: string;
 };
 
@@ -2287,20 +2289,6 @@ export interface SliderOwnProps {
 // @public (undocumented)
 export interface SliderProps<T extends number | number[]>
   extends Omit<SliderProps_2<T>, 'children' | 'className'>,
-    Omit<
-      FieldLabelProps,
-      | 'htmlFor'
-      | 'id'
-      | 'className'
-      | 'defaultValue'
-      | 'onChange'
-      | 'slot'
-      | 'style'
-      | 'label'
-      | 'secondaryLabel'
-      | 'description'
-      | 'isRequired'
-    >,
     SliderOwnProps {}
 
 // @public (undocumented)

packages/ui/src/definitions.ts

@@ -52,10 +52,6 @@ export { MenuDefinition } from './components/Menu/definition';
 export { PasswordFieldDefinition } from './components/PasswordField/definition';
 export { PopoverDefinition } from './components/Popover/definition';
 export { RadioGroupDefinition } from './components/RadioGroup/definition';
-export {
-  SearchAutocompleteDefinition,
-  SearchAutocompleteItemDefinition,
-} from './components/SearchAutocomplete/definition';
 export { SearchFieldDefinition } from './components/SearchField/definition';
 export { SelectDefinition } from './components/Select/definition';
 export { SkeletonDefinition } from './components/Skeleton/definition';