From 071b29d136dbe6106e7b285edf315987ef01abe1 Mon Sep 17 00:00:00 2001
From: ehab-hassan <queenann724@gmail.com>
Date: Sat, 12 Oct 2024 20:48:20 +0300
Subject: [PATCH] fix conflict2

---
 src/components/Abouthero.jsx    |  9 ---------
 src/components/Aboutnodes.jsx   |  5 -----
 src/components/Bentosection.jsx |  9 ---------
 src/components/Bottom.jsx       |  9 ---------
 src/components/Button.jsx       |  4 ----
 src/components/Communhero.jsx   | 10 ----------
 src/components/Cta.jsx          |  7 -------
 src/components/Eventbanner.jsx  | 10 ----------
 src/components/Events.jsx       |  8 --------
 src/components/Featurehero.jsx  |  9 ---------
 src/components/Featureshome.jsx |  6 ------
 src/components/HeroFeature.jsx  |  8 --------
 src/components/Heropage.jsx     | 11 -----------
 src/components/Homepage.jsx     | 14 --------------
 src/components/Phases.jsx       | 12 ------------
 src/components/Usecases.jsx     | 10 ----------
 16 files changed, 141 deletions(-)

diff --git a/src/components/Abouthero.jsx b/src/components/Abouthero.jsx
index 73b05f6..2accf9f 100644
--- a/src/components/Abouthero.jsx
+++ b/src/components/Abouthero.jsx
@@ -17,13 +17,8 @@ export default function Abouthero() {
       </div>
       <div className="mx-auto max-w-7xl px-6 lg:px-8">
         <div className="mx-auto max-w-2xl lg:mx-0">
-<<<<<<< HEAD
-          <h2 className="lg:text-6xl font-semibold tracking-tight lg:max-w-xl max-w-md leading-tight text-gradient text-3xl">At OurVerse, <br/>
-          we go beyond traditional video calls. </h2>
-=======
           <h2 className="lg:text-6xl font-semibold tracking-tight lg:max-w-2xl max-w-xl leading-tight text-white text-3xl">
           Beyond Traditional Video Calls. </h2>
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
           <p className="mt-6 section-text-light  font-display">
           Our immersive decentralized metaverse platform brings people together in a dynamic, interactive environment where meetings and events feel REAL. 
           </p>
@@ -32,11 +27,7 @@ export default function Abouthero() {
           <div className="mt-10 pb-8 flex items-center gap-x-6">
             <a
               href="#"
-<<<<<<< HEAD
-              className="rounded-2xl btn-gradient-dark2 font-semibold px-3.5 py-2.5"
-=======
               className="rounded-2xl btn-dark text-base font-semibold px-3.5 py-2.5"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
             >
               Join OurVerse
             </a>
diff --git a/src/components/Aboutnodes.jsx b/src/components/Aboutnodes.jsx
index 6bfb823..e3d47cf 100644
--- a/src/components/Aboutnodes.jsx
+++ b/src/components/Aboutnodes.jsx
@@ -21,15 +21,10 @@ export default function Aboutnodes() {
           </p>
           <div className="mt-8">
             <a
-<<<<<<< HEAD
-              href="/community.html"
-              className="inline-flex rounded-2xl bg-white/10 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm btn-gradient-dark2"
-=======
               href="https://www.threefold.io/getnode/"
               className="inline-flex rounded-2xl bg-white/10 px-3.5 py-2.5 text-base font-semibold text-white shadow-sm btn-dark"
               target="_blank"
               rel="noopener noreferrer"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
             >
               Host a Node
             </a>
diff --git a/src/components/Bentosection.jsx b/src/components/Bentosection.jsx
index 5de6429..7f88b57 100644
--- a/src/components/Bentosection.jsx
+++ b/src/components/Bentosection.jsx
@@ -67,21 +67,12 @@ export default function BentoSection() {
           </p>
           <div className="mt-10 flex gap-x-8">
           <a
-<<<<<<< HEAD
-              href="#"
-              className="rounded-2xl btn-gradient-dark px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-purple-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500"
-            >
-              See Features
-            </a>
-          <a href="#" className="text-sm py-2.5 font-semibold leading-6 text-cyan-600 hover:text-purple-500">
-=======
               href="/features.html"
               className="rounded-2xl btn-dark px-3.5 py-2.5 text-base font-semibold text-white shadow-sm hover:bg-purple-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500"
             >
               See Features
             </a>
           <a href="/usecases.html" className="text-base py-2.5 font-semibold leading-6 text-link">
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
           Read Use Cases <span aria-hidden="true">→</span>
             </a>
             </div>
diff --git a/src/components/Bottom.jsx b/src/components/Bottom.jsx
index 96c719b..233c088 100644
--- a/src/components/Bottom.jsx
+++ b/src/components/Bottom.jsx
@@ -3,11 +3,7 @@ export default function Bottom() {
       <div className="relative isolate overflow-hidden bg-gray-900">
         <div className="px-6 py-24 sm:px-6 sm:py-32 lg:px-8">
           <div className="mx-auto max-w-2xl text-center">
-<<<<<<< HEAD
-            <h2 className="text-3xl font-bold tracking-tight text-gradient-light lg:text-5xl">
-=======
             <h2 className="text-3xl font-bold tracking-tight text-white  lg:text-5xl">
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
               The Future of Collaboration
               <br />
               is now.
@@ -17,15 +13,10 @@ export default function Bottom() {
             </p>
             <div className="mt-10 flex items-center justify-center gap-x-6">
               <a
-<<<<<<< HEAD
-                href="#"
-                className="rounded-2xl btn-gradient-dark2 px-3.5 py-2.5 text-sm font-semibold text-gray-900 shadow-sm hover:bg-gray-100 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white"
-=======
                 href="https://portal.ourverse.tf"
                 className="rounded-2xl btn-dark text-base font-semibold text-gray-900"
                 target="_blank"
                 rel="noopener noreferrer"c
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
               >
                 Sign Up Now
               </a>
diff --git a/src/components/Button.jsx b/src/components/Button.jsx
index 1320a3c..319f6e2 100644
--- a/src/components/Button.jsx
+++ b/src/components/Button.jsx
@@ -3,11 +3,7 @@ import clsx from 'clsx'
 
 export function Button({ className, ...props }) {
   className = clsx(
-<<<<<<< HEAD
-    'inline-flex justify-center rounded-2xl btn-gradient-dark py-2 px-4 text-xs font-semibold text-white hover:btn-gradient-dark-hover focus:outline-none focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500 active:text-white/70',
-=======
     'inline-flex justify-center rounded-2xl btn-dark py-4 px-3 text-sm font-semibold text-white hover:btn-dark-hover focus:outline-none focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500 active:text-white/70',
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
     className,
   )
 
diff --git a/src/components/Communhero.jsx b/src/components/Communhero.jsx
index 05ed5aa..66ed321 100644
--- a/src/components/Communhero.jsx
+++ b/src/components/Communhero.jsx
@@ -15,15 +15,9 @@ export default function Communhero() {
       
       {/* Content container with a higher z-index */}
       <div className="relative z-10 mx-auto max-w-7xl px-6 lg:px-8">
-<<<<<<< HEAD
-        <div className="mx-auto max-w-2xl lg:mx-0">
-          <h2 className="mt-2 text-3xl font-semibold tracking-tight text-gradient sm:text-4xl">
-          A United Community <br/>Creating the Future of <br/>Virtual Worlds
-=======
         <div className="mx-auto max-w-xl lg:mx-0">
           <h2 className="mt-2 lg:text-5xl font-semibold tracking-tight text-white text-3xl">
           Create the Future of Virtual World Together 
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
           </h2>
           <p className="mt-6 section-text-light font-display max-w-xl text-purple-50">
           Join a global movement where visionaries, creators, and innovators come together to shape immersive digital experiences. 
@@ -35,11 +29,7 @@ export default function Communhero() {
           <div className="mt-10 pb-8 flex items-center gap-x-6">
             <a
               href="#"
-<<<<<<< HEAD
-              className="rounded-2xl btn-gradient-dark2 font-semibold px-3.5 py-2.5"
-=======
               className="rounded-2xl btn-dark font-semibold px-3.5 py-2.5"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
             >
               Join OurVerse
             </a>
diff --git a/src/components/Cta.jsx b/src/components/Cta.jsx
index f002a92..538f3c0 100644
--- a/src/components/Cta.jsx
+++ b/src/components/Cta.jsx
@@ -20,20 +20,13 @@ export default function CTA() {
             <div className="mt-8">
               <a
                 href="/community.html"
-<<<<<<< HEAD
-                className="inline-flex rounded-2xl bg-white/10 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm btn-gradient-dark2"
-=======
                 className="inline-flex rounded-2xl bg-white/10 px-3.5 py-2.5 text-base font-semibold text-white shadow-sm btn-dark"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
               >
                 Be a Part of OurVerse
               </a>
-<<<<<<< HEAD
-=======
               <a href="https://threefold.io" className=" inline-flex  text-base py-2.5 font-semibold leading-6 text-link" target="_blank" rel="noopener noreferrer">
                 Visit ThreeFold  <span aria-hidden="true"> →</span>
             </a>
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
             </div>
           </div>
         </div>
diff --git a/src/components/Eventbanner.jsx b/src/components/Eventbanner.jsx
index 7a85606..b4564e1 100644
--- a/src/components/Eventbanner.jsx
+++ b/src/components/Eventbanner.jsx
@@ -18,26 +18,16 @@ export default function Eventbanner() {
             <div aria-hidden="true" className="relative h-32 w-full lg:hidden" />
             <div className="absolute py-4 inset-x-0 bottom-0 rounded-bl-lg rounded-br-lg bg-purple-950 bg-opacity-90 p-6 backdrop-blur backdrop-filter sm:flex sm:items-center sm:justify-between lg:inset-x-auto lg:inset-y-0 lg:w-96  lg:flex-col lg:items-start lg:rounded-br-none lg:rounded-tl-lg">
               <div>
-<<<<<<< HEAD
-                <h2 className="mt-4 lg:text-3xl text-xl font-bold text-gradient-light">OurVerse </h2>
-                    <h2 className="lg:text-3xl text-xl font-bold text-gradient-light">FutureFest 2024</h2>
-                    <h3 className="text-xl font-bold text-gradient-light">Nov 22 - 24</h3>
-=======
                 <h2 className="mt-4 lg:text-3xl text-xl font-bold text-white">OurVerse </h2>
                     <h2 className="lg:text-3xl text-xl font-bold text-white">FutureFest 2024</h2>
                     <h3 className="text-xl font-bold text-white">Nov 22 - 24</h3>
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
                 <p className="mt-4 text-md text-gray-300">
                 OurVerse's OurFutureFest connects freelancers, innovators, and businesses in the Metaverse, empowering them to explore new technologies and collaborate seamlessly across boundaries.
                 </p>
               </div>
               <a
                 href="/events/versefest.html"
-<<<<<<< HEAD
-                className="mt-6 flex flex-shrink-0 items-center justify-center rounded-md btn-gradient-dark bg-opacity-0 px-4 py-3 text-base font-medium text-white hover:bg-opacity-10 sm:ml-8 sm:mt-0 lg:ml-0 lg:w-full"
-=======
                 className="mt-6 flex flex-shrink-0 items-center justify-center rounded-md btn-dark bg-opacity-0 px-4 py-3 text-base font-medium text-white hover:bg-opacity-10 sm:ml-8 sm:mt-0 lg:ml-0 lg:w-full"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
               >
                 Register Now
               </a>
diff --git a/src/components/Events.jsx b/src/components/Events.jsx
index 86b6648..66bf661 100644
--- a/src/components/Events.jsx
+++ b/src/components/Events.jsx
@@ -54,19 +54,11 @@ const featuredPost = {
             <div className="mt-4 flex items-center gap-x-6">
                     <a
                       href="#"
-<<<<<<< HEAD
-                      className="rounded-2xl font-semibold btn-gradient-dark2 text-sm leading-6"
-                    >
-                      Learn More
-                    </a>
-                    <a href="/events" className="text-sm font-semibold leading-6 text-cyan-600 hover:text-purple-700">
-=======
                       className="rounded-2xl font-semibold btn-dark text-base leading-6"
                     >
                       Learn More
                     </a>
                     <a href="/events" className="text-base font-semibold leading-6 text-linkgo">
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
                       See more events <span aria-hidden="true">→</span>
                     </a>
                   </div>
diff --git a/src/components/Featurehero.jsx b/src/components/Featurehero.jsx
index 9d50563..099a1fe 100644
--- a/src/components/Featurehero.jsx
+++ b/src/components/Featurehero.jsx
@@ -17,11 +17,7 @@ export default function Featurehero() {
       </div>
       <div className="mx-auto max-w-7xl px-6 lg:px-8">
         <div className="mx-auto max-w-2xl lg:mx-0">
-<<<<<<< HEAD
-          <h2 className="lg:text-6xl font-semibold tracking-tight text-gradient text-xl">The Future of Collaboration</h2>
-=======
           <h2 className="lg:text-6xl font-semibold tracking-tight text-white text-4xl">The Future of Collaboration</h2>
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
           <p className="mt-6 section-text-light max-w-xl font-display">
           Step into the future of communication and collaboration with immersive virtual environments. 
           OurVerse provides innovative tools that transform your events, meetings, and creative projects, 
@@ -29,15 +25,10 @@ export default function Featurehero() {
           </p>
           <div className="mt-10 pb-8 flex items-center gap-x-6">
             <a
-<<<<<<< HEAD
-              href="#"
-              className="rounded-2xl btn-gradient-dark2 font-semibold px-3.5 py-2.5"
-=======
               href="https://portal.ourverse.tf"
               className="rounded-2xl btn-dark font-semibold px-3.5 py-2.5"
               target="_blank"
               rel="noopener noreferrer"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
             >
               Join OurVerse
             </a>
diff --git a/src/components/Featureshome.jsx b/src/components/Featureshome.jsx
index c953ba1..e15835d 100644
--- a/src/components/Featureshome.jsx
+++ b/src/components/Featureshome.jsx
@@ -185,13 +185,7 @@ export default function Featureshome() {
                   </div>
                 ))}
                 <div className="mt-6">
-<<<<<<< HEAD
-                  <a
-                    href="/features"
-                    className="inline-flex rounded-2xl px-4 py-1.5 text-base font-semibold leading-7 text-white shadow-sm btn-gradient-dark"
-=======
                   <a href="/features" className="inline-flex rounded-2xl px-4 py-1.5 text-base font-semibold leading-7 text-white shadow-sm btn-dark"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
                   >
                     Explore Features
                   </a>
diff --git a/src/components/HeroFeature.jsx b/src/components/HeroFeature.jsx
index d211636..75aab66 100644
--- a/src/components/HeroFeature.jsx
+++ b/src/components/HeroFeature.jsx
@@ -64,19 +64,11 @@ import {
         <div className="mt-10 pb-8 flex items-center justify-center gap-x-6">
             <a
               href="#"
-<<<<<<< HEAD
-              className="rounded-2xl btn-gradient-dark px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-purple-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500"
-            >
-              Try Now
-            </a>
-            <a href="#" className="text-sm font-semibold leading-6 text-purple-900 hover:text-purple-500">
-=======
               className="rounded-2xl btn-dark px-3.5 py-2.5 text-base font-semibold text-white shadow-sm hover:bg-purple-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500"
             >
               Try Now
             </a>
             <a href="/heroverse.html" className="text-base font-semibold leading-6 text-link">
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
               Learn more <span aria-hidden="true">→</span>
             </a>
           </div>
diff --git a/src/components/Heropage.jsx b/src/components/Heropage.jsx
index 2483ef2..9df3fac 100644
--- a/src/components/Heropage.jsx
+++ b/src/components/Heropage.jsx
@@ -20,27 +20,16 @@ export function Heropage() {
         </video>
 
         <div className="mx-auto max-w-xl lg:max-w-6xl text-center">
-<<<<<<< HEAD
-          <h1 className="font-display lg:max-w-3xl font-bold text-gradient tracking-tighter lg:text-6xl text-4xl">
-          OurHero Verse 3D
-          </h1>
-          <h2 className="font-display mt-8 lg:max-w-4xl section-text-light">OurVerse has developed <span className='text-gradient font-semibold'>OurHero Verse 3D</span>, a cutting-edge system that allows users to generate full 3D virtual environments using text input alone. With this tool, users can create immersive and interactive environments, tailored to their needs, simply by describing them.  <br/> <br/>In addition to full environments, the system can generate HDRI environments, ensuring a surrounding atmosphere that matches the generated space. </h2>
-=======
           <h1 className="font-display lg:max-w-3xl font-bold text-white tracking-tighter lg:text-6xl text-4xl">
           OurHero Verse 3D
           </h1>
           <h2 className="font-display mt-8 lg:max-w-4xl section-text-light">OurVerse has developed <span className='font-semibold text-white'>OurHero Verse 3D</span>, a cutting-edge system that allows users to generate full 3D virtual environments using text input alone. With this tool, users can create immersive and interactive environments, tailored to their needs, simply by describing them.  <br/> <br/>In addition to full environments, the system can generate HDRI environments, ensuring a surrounding atmosphere that matches the generated space. </h2>
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
           <div className="lg:max-w-3xl max-w-2xl my-6 space-y-6 font-display font-medium lg:text-2xl text-xl tracking-tight leading-normal text-purple-800">
           </div>
           <div className="mt-10 pb-8 flex items-center justify-center gap-x-6">
             <a
               href="#"
-<<<<<<< HEAD
-              className="rounded-2xl btn-gradient-dark px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-purple-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500"
-=======
               className="rounded-2xl btn-dark px-3.5 py-2.5 text-base font-semibold shadow-sm"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
             >
               Try HeroVerse 3D
             </a>
diff --git a/src/components/Homepage.jsx b/src/components/Homepage.jsx
index 02ce175..a577b36 100644
--- a/src/components/Homepage.jsx
+++ b/src/components/Homepage.jsx
@@ -21,25 +21,12 @@ export function Homepage() {
 
         <div className="mx-auto max-w-xl lg:max-w-6xl text-center">
           <h1 className="font-display lg:max-w-3xl font-bold text-white tracking-tighter lg:text-7xl text-5xl">
-<<<<<<< HEAD
-            The Future of <span className='text-gradient-light'>Collaboration is Now.</span>
-=======
             The Future of <span className='text-white'>Collaboration is Now.</span>
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
           </h1>
           <div className="lg:max-w-3xl max-w-2xl my-6 space-y-6 font-display font-medium lg:text-2xl text-xl tracking-tight leading-normal text-purple-800">
           </div>
           <div className="mt-10 pb-8 flex items-center justify-center gap-x-6">
             <a
-<<<<<<< HEAD
-              href="#"
-              className="rounded-2xl btn-gradient-dark px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-purple-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-purple-500"
-            >
-              Join OurVerse
-            </a>
-            <a href="#" className="text-sm font-semibold leading-6 text-white hover:text-purple-200">
-              Learn more <span aria-hidden="true">→</span>
-=======
               href="https://portal.ourverse.tf"
               target="_blank" 
               rel="noopener noreferrer" 
@@ -49,7 +36,6 @@ export function Homepage() {
             </a>
             <a href="/features.html" className="text-base font-semibold leading-6 text-white hover:text-purple-200">
               Discover Features <span aria-hidden="true">→</span>
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
             </a>
           </div>
         </div>
diff --git a/src/components/Phases.jsx b/src/components/Phases.jsx
index 8a318f8..eaa4a33 100644
--- a/src/components/Phases.jsx
+++ b/src/components/Phases.jsx
@@ -44,11 +44,7 @@ export function Phasesdark() {
     return (
         <div className="bg-gradient-dark min-h-screen">
           <div className="mx-auto max-w-7xl py-24 px-6 lg:px-8">
-<<<<<<< HEAD
-            <h2 className="lg:text-4xl pt-20 font-semibold tracking-tight leading-normal text-gradient-light text-3xl">
-=======
             <h2 className="lg:text-4xl pt-20 font-semibold tracking-tight leading-normal text-white text-3xl">
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
               Experience True Collaboration
             </h2>
             <p className="mt-4 mb-4 text-purple-100 lg:text-xl space-y-6 font-display">
@@ -66,11 +62,7 @@ export function Phasesdark() {
                   <time
                     dateTime={item.dateTime}
                     className={`flex items-center text-md font-semibold leading-6 ${
-<<<<<<< HEAD
-                      item.date === 'Phase IV' || item.date === 'Phase V' ? 'text-purple-lt lg:text-xl' : 'text-purple-200'
-=======
                       item.date === 'Phase IV' || item.date === 'Phase V' ? 'text-white lg:text-xl' : 'text-purple-200'
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
                     }`}
                   >
                     <svg viewBox="0 0 4 4" aria-hidden="true" className="mr-4 h-1 w-1 flex-none">
@@ -80,11 +72,7 @@ export function Phasesdark() {
                   </time>
                   <p
                     className={`mt-6 text-lg font-semibold leading-6 tracking-tight ${
-<<<<<<< HEAD
-                      item.date === 'Phase IV' || item.date === 'Phase V' ? 'text-purple-lt' : 'text-purple-200'
-=======
                       item.date === 'Phase IV' || item.date === 'Phase V' ? 'text-white' : 'text-purple-200'
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
                     }`}
                   >
                     {item.name}
diff --git a/src/components/Usecases.jsx b/src/components/Usecases.jsx
index a44d0ba..602e1c7 100644
--- a/src/components/Usecases.jsx
+++ b/src/components/Usecases.jsx
@@ -15,13 +15,8 @@ export default function Usecases() {
       {/* Content container with a higher z-index */}
       <div className="relative z-10 mx-auto max-w-7xl px-6 lg:px-8">
         <div className="mx-auto max-w-2xl lg:mx-0">
-<<<<<<< HEAD
-          <h2 className="mt-2 text-3xl font-semibold tracking-tight text-gradient sm:text-4xl">
-            Exploring Impactful<br/>Use Cases from <br/>Real-life Applications
-=======
           <h2 className="mt-2 lg:text-5xl font-semibold tracking-tight text-white text-3xl">
             Exploring Impactful Use Cases from Real-life Applications
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
           </h2>
           <p className="mt-6 text-lg max-w-xl leading-8 text-purple-50">
             Discover how OurVerse uniquely addresses challenges and fosters innovation in education, healthcare, environmental conservation, 
@@ -31,15 +26,10 @@ export default function Usecases() {
         
         <div className="mt-10 pb-8 flex items-center gap-x-6">
             <a
-<<<<<<< HEAD
-              href="#"
-              className="rounded-2xl btn-gradient-dark2 font-semibold px-3.5 py-2.5"
-=======
               href="https://portal.ourverse.tf"
               className="rounded-2xl btn-dark font-semibold px-3.5 py-2.5"
               target="_blank"
               rel="noopener noreferrer"
->>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
             >
               Join OurVerse
             </a>