docs(popover): new component usage and style tab content

src/pages/all-about-carbon/the-carbon-ecosystem.mdx

@@ -27,9 +27,12 @@ assets and guidance but Carbon is more than one website.
 
 At its core, Carbon has universal assets–elements, components, patterns, and
 code–and guidance for how to design and build with them. These assets are
-considered universal or fundamental in nature, which means they can be used as a
-base for the widest variety of situations, and extended or adapted for the
-specific business use cases.
+<<<<<<< HEAD considered universal or fundamental in nature, which means they can
+be used as a ======= considered universal or fundamental in nature, which means
+they can used as a
+
+> > > > > > > main base for the widest variety of situations, and extended or
+> > > > > > > adapted for the specific business use cases.
 
 Beyond this core is a distributed ecosystem of sites that support and serve the
 design and development communities within IBM and, where open source content is

src/pages/all-about-carbon/what-is-carbon.mdx

@@ -28,10 +28,10 @@ community of contributors.
 
 A design system is a collection of pre-built, reusable assets—components,
 patterns, guidance, and code—that allows its users to build consistent digital
-experiences faster. By using the pre-built and universal assets of Carbon, the
-time teams spend designing and building is minimized. Instead of building and
-re-building basic elements, they can spend that time customizing their products
-to address specific client use cases.
+<<<<<<< HEAD experiences faster. By using the pre-built and universal assets of
+Carbon, the time teams spend designing and building is minimized. Instead of
+building and re-building basic elements, they can spend that time customizing
+their products to address specific client use cases.
 
 ### Carbon is open source
 
@@ -40,6 +40,24 @@ business needs, but we’ve made it open source for anyone to use and contribute
 back to. While being primarily open source, Carbon also serves various parts of
 the IBM business that follow an inner source model.
 
+======= experiences faster.
+
+By using the pre-built and universal assets of Carbon, the time teams spend
+designing and building is minimized. Instead of building and re-building basic
+elements, they can spend that time customizing their products to address
+specific client use cases.
+
+### Carbon is open source
+
+Carbon is funded and built by IBM, which means we build for the company’s
+business needs, but we’ve made it open source for anyone to use and contribute
+back to.
+
+While being primarily open source, Carbon also serves various parts of the IBM
+business that follow an inner source model.
+
+> > > > > > > main
+
 ## How Carbon works
 
 The Carbon team is committed to helping members of the community be successful

src/pages/community/patterns/chatbot/overview.mdx

@@ -132,8 +132,13 @@ guidance related to your use case.
     subTitle="Sketch library"
     title="Chatbot Design Kit"
     aspectRatio="2:1"
+<<<<<<< HEAD
+    actionIcon="download"
+    href="sketch://add-library/cloud/d6986eb8-bf0d-4695-abe8-9e79909d4518">
+=======
     actionIcon="launch"
     href="https://www.sketch.com/s/d6986eb8-bf0d-4695-abe8-9e79909d4518">
+>>>>>>> upstream/main
     <MdxIcon name="sketch" />
   </ResourceCard>
 </Column>