Resolve merge conflicts

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

docs-ui/src/utils/data.ts

@@ -86,8 +86,8 @@ export const components: Page[] = [
     slug: 'radio-group',
   },
   {
-    title: 'Slider',
-    slug: 'slider',
+    title: 'SearchAutocomplete',
+    slug: 'search-autocomplete',
   },
   {
     title: 'SearchField',
@@ -101,6 +101,18 @@ export const components: Page[] = [
     title: 'Skeleton',
     slug: 'skeleton',
   },
+  {
+    title: 'Slider',
+    slug: 'slider',
+  },
+  {
+    title: 'Select',
+    slug: 'select',
+  },
+  {
+    title: 'Skeleton',
+    slug: 'skeleton',
+  },
   {
     title: 'Switch',
     slug: 'switch',

packages/ui/src/definitions.ts

@@ -52,10 +52,14 @@ 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 { SliderDefinition } from './components/Slider/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';
+export { SliderDefinition } from './components/Slider/definition';
 export { SwitchDefinition } from './components/Switch/definition';
 export { ToggleButtonDefinition } from './components/ToggleButton/definition';
 export { ToggleButtonGroupDefinition } from './components/ToggleButtonGroup/definition';