fixed conflicts

src/pages/technology.astro

@@ -8,7 +8,7 @@ import Layout from '~/layouts/PageLayout.astro';
 import Steps from '~/components/widgets/Steps.astro';
 import Content from '~/components/widgets/Content.astro';
 import CallToAction from '~/components/widgets/CallToAction.astro';
-
+import AutonomousCloud from './autonomouscloud_engine.astro'
 const metadata = {
   title: 'Technology',
 };
@@ -17,12 +17,14 @@ const metadata = {
 <Layout metadata={metadata}>
   <!-- Hero Widget ******************* -->
 
-  <Hero
+  <Hero 
     tagline="Technology"
   >
     <Fragment slot="title">
-      Our technology enables <br>a planetary-scale grid of interconnected nodes
-      <span class="text-accent dark:text-white highlight"> </span>
+      Our technology enables<br>
+      a <span class="text-accent dark:text-white highlight"> planetary-scale </span> grid
+      <br> of interconnected nodes
+      
     </Fragment>
 
     <Fragment slot="subtitle">
@@ -104,6 +106,7 @@ const metadata = {
     </Fragment>
   </Content>
 
+
   <Content
     isReversed
     id="qsfs"
@@ -127,8 +130,11 @@ const metadata = {
       loading: 'eager',
     }}
   >
+
+  <AutonomousCloud/>
+
     <Fragment slot="content">
-      <h2 class="text-2xl font-bold tracking-tight dark:text-white sm:text-3xl mb-2">Quantum-Safe File System</h2>
+      <h2 class="text-2xl font-bold tracking-tight dark:text-white sm:text-3xl mb-2">Quantum-Safe Storage</h2>
       <p>
         Quantum computers are theoretically capable of doing huge calculations in a short period of time and represent a great potential threat to future online safety. ThreeFold solves this future problem before it even becomes a reality. Our operating system can compress, encrypt, and disperse data across the grid ensuring redundancy.
       </p>
@@ -274,7 +280,7 @@ const metadata = {
     <Fragment slot="title">Expand the Grid with Us</Fragment>
 
     <Fragment slot="subtitle">
-      We have the technology for a planetary-scale alternative<br> to mainstream cloud and current monopolistic markets.<br><br>Project Internet Capacity is the Unbreakable Internet.
+      We have the technology for a planetary-scale alternative<br> to mainstream cloud and current monopolistic markets.<br><br>INCA is the Unbreakable Internet.
     </Fragment>
   </CallToAction>
 </Layout>