fix conflict2

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>