fixed conflicts

src/pages/farming.astro

@@ -6,6 +6,9 @@ import FAQs from '~/components/widgets/FAQs.astro';
 import Steps from '~/components/widgets/Steps.astro';
 import Features3 from '~/components/widgets/Features3.astro';
 import CallToAction from '~/components/widgets/CallToAction.astro';
+import Hero from '~/components/widgets/Hero.astro';
+import InternetCapacity from './internetcapacity.astro';
+import NodeSteps from './steps_node_buy.astro'
 
 const metadata = {
   title: 'Farming',
@@ -42,6 +45,9 @@ const metadata = {
           {
             description: '8 Logical CPU Cores',
           },
+          {
+            description: '2,000-6,000 INCA reward per month.',
+          }          
         ],
         callToAction: {
           target: '_blank',
@@ -64,6 +70,9 @@ const metadata = {
           {
             description: '16 Logical CPU Cores',
           },
+          {
+            description: '4,000-12,000 INCA reward per month.',
+          }
         ],
         callToAction: {
           target: '_blank',
@@ -88,6 +97,9 @@ const metadata = {
           {
             description: 'RTX 4900 GPU',
           },
+          {
+            description: '10,000-30,000 INCA reward per month.',
+          }
         ],
         callToAction: {
           target: '_blank',
@@ -96,11 +108,16 @@ const metadata = {
         },
       },
     ]}
+
+    
   />
+ 
+
 
   <!-- Features3 Widget ************** -->
 
   <Features3
+    id="nodestech"
     title="Nodes Leading at the Edge"
     subtitle="Discover how our nodes provide a groundbreaking, reliable and robust technology"
     columns={2}
@@ -173,7 +190,8 @@ const metadata = {
   <!-- FAQs Widget ******************* -->
 
   <FAQs
-    title="Nodes FAQs"
+    id="farmingfaq"
+    title="Farming FAQs"
     subtitle="Choosing the right node for you is a crucial step, <br>and we're here to answer your questions. "
     columns={1}
     items={[
@@ -213,7 +231,7 @@ const metadata = {
     actions={[
       {
         variant: 'primary',
-        text: 'Build DIY INCA Nodes',
+        text: 'Build INCA Nodes',
         href: 'https://manual.grid.tf/documentation/farmers/3node_building/3node_building.html',
       },
     ]}