fix merge conflict

Author: rezrah

apps/next-docs/content/components/Tooltip/index.mdx

@@ -63,9 +63,5 @@ Use this with caution. It is generally better to use a visible label for better
 
 ## Related components
 
-<<<<<<< HEAD
-- [Button](/components/Button): Often used in conjunction with tooltips.
-=======
 - [Popover](/components/Popover): For displaying more complex interactive content that appears when triggered
 - [Button](/components/Button): Often used in conjunction with tooltips
->>>>>>> 0f080230 (bundle docs and clean up package files)