diff --git a/docs/components/Data Display/Tooltip/Documentation.mdx b/docs/components/Data Display/Tooltip/Documentation.mdx
index dd92d7026..77e634184 100644
--- a/docs/components/Data Display/Tooltip/Documentation.mdx	
+++ b/docs/components/Data Display/Tooltip/Documentation.mdx	
@@ -1,14 +1,14 @@
-import { Meta, Canvas } from '@storybook/blocks'
+import { Meta, Canvas } from '@storybook/blocks';
 
-import * as TooltipStories from '../../../../src/components/data-display/Tooltip/Tooltip.stories'
+import * as TooltipStories from '../../../../src/components/data-display/Tooltip/Tooltip.stories';
 
 <Meta of={TooltipStories} />
 
+{/* Documentation goes here */}
+
 # Tooltip
 
 ### Overview
-<<<<<<< HEAD
-=======
 The Tooltip is a lightweight, contextual UI element used to display additional information when a user hovers over or focuses on an element. It enhances the user experience by providing supplementary details without cluttering the interface.
 
 ### When to use:
@@ -21,25 +21,6 @@ The Tooltip is a lightweight, contextual UI element used to display additional i
 | ------ | -------- |
 | Eames  | [Tooltip Component](https://www.figma.com/design/veXnmignQnJz8StIq10VJ5/Eames-2.0---Foundations-%26-Components?node-id=413-13162&t=5iHsAw2QyK8Lx8zt-4) |
 
+{/* Documentation goes here */}
 
-
->>>>>>> 05e4899db51845c059400c4d8fec5f3374c6f828
-
-The Tooltip is a lightweight, contextual UI element used to display additional information when a user hovers over or focuses on an element. It enhances the user experience by providing supplementary details without cluttering the interface.
-
-<Canvas meta={TooltipStories.default} />
-<<<<<<< HEAD
-
-### When to use
-
-- To provide context or explanation for a UI element, icon, button, or data point that may not be immediately clear.
-- When more information is needed to explain an action, label, or feature without disrupting the user's flow.
-- To guide users with short, helpful messages, especially when onboarding or interacting with complex components.
-
-#### Related Links
-
-| Type  | Resource                                                                                                                                               |
-| ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Eames | [Tooltip Component](https://www.figma.com/design/veXnmignQnJz8StIq10VJ5/Eames-2.0---Foundations-%26-Components?node-id=413-13162&t=5iHsAw2QyK8Lx8zt-4) |
-=======
->>>>>>> 05e4899db51845c059400c4d8fec5f3374c6f828
+<Canvas meta={TooltipStories.default} />
\ No newline at end of file
diff --git a/docs/components/Data Entry/Select/Documentation.mdx b/docs/components/Data Entry/Select/Documentation.mdx
index 00ff8b059..1dc415445 100644
--- a/docs/components/Data Entry/Select/Documentation.mdx	
+++ b/docs/components/Data Entry/Select/Documentation.mdx	
@@ -1,20 +1,20 @@
-import { Meta, Canvas } from '@storybook/blocks'
+import { Meta, Canvas } from '@storybook/blocks';
 
-import * as SelectStories from '../../../../src/components/data-entry/Select/Select.stories'
+import * as SelectStories from '../../../../src/components/data-entry/Select/Select.stories';
 
 <Meta of={SelectStories} />
 
+{/* Documentation goes here */}
+
 # Select
 
 ### Overview
-<<<<<<< HEAD
-=======
- Select component allows  users to select the necessary record from a list.
+Select component allows  users to select the necessary record from a list.
 
 
 ### When to use:
 - When users need to filter or refine data views based on specific criteria (e.g., selecting records by status or category).
-- When there are distinct categories or options that users must choose from during data entry 
+- When there are distinct categories or options that users must choose from during data entry
 - When the list of options is too long to display effectively with buttons, checkboxes, or radio buttons, allowing for a compact, scrollable dropdown.
 
 
@@ -29,31 +29,6 @@ import * as SelectStories from '../../../../src/components/data-entry/Select/Sel
 | ------ | -------- |
 | Eames  | [Select Component](https://www.figma.com/design/veXnmignQnJz8StIq10VJ5/Eames-2.0---Foundations-%26-Components?node-id=1217-31707&t=5iHsAw2QyK8Lx8zt-4) |
 
+{/* Documentation goes here */}
 
-
->>>>>>> 05e4899db51845c059400c4d8fec5f3374c6f828
-
-Select component allows users to select the necessary record from a list.
-
-<Canvas meta={SelectStories.default} />
-<<<<<<< HEAD
-
-### When to use:
-
-- When users need to filter or refine data views based on specific criteria (e.g., selecting records by status or category).
-- When there are distinct categories or options that users must choose from during data entry
-- When the list of options is too long to display effectively with buttons, checkboxes, or radio buttons, allowing for a compact, scrollable dropdown.
-
-### Related Components:
-
-- Multiselect [Insert Link]
-- Select with Search [Insert Link]
-- Select with Autocomplete [Insert Link]
-
-#### Related Links
-
-| Type  | Resource                                                                                                                                               |
-| ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Eames | [Select Component](https://www.figma.com/design/veXnmignQnJz8StIq10VJ5/Eames-2.0---Foundations-%26-Components?node-id=1217-31707&t=5iHsAw2QyK8Lx8zt-4) |
-=======
->>>>>>> 05e4899db51845c059400c4d8fec5f3374c6f828
+<Canvas meta={SelectStories.default} />
\ No newline at end of file