From c52ee2e0d2150cfc464156621bc7b7f9ca9acd7a Mon Sep 17 00:00:00 2001
From: Don Starwsburg <don@goforward.group>
Date: Wed, 20 Nov 2024 13:48:04 -0500
Subject: [PATCH] fixed merge conflict

---
 app/page.tsx | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/page.tsx b/app/page.tsx
index 8c443e7..3f88a2e 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -2,22 +2,21 @@ import Link from "next/link";
 
 export default function Home() {
   return (
-    <div className="bg-gray-100 min-h-screen flex flex-col">
+    (<div className="bg-gray-100 min-h-screen flex flex-col">
       {/* Header Section */}
       <header className="bg-gray-800 text-white py-4 shadow-md">
         <div className="container mx-auto px-6 flex justify-between items-center">
           <h1 className="text-2xl font-bold">Firearm Builder</h1>
           <nav>
             <ul className="flex space-x-4">
-                <li><Link href="#features"><a className="hover:underline">Features</a></Link></li>
-                <li><Link href="/builder"><a className="hover:underline">Builder</a></Link></li>
-                <li><Link href="/products"><a className="hover:underline">Products</a></Link></li>
-                <li><Link href="#contact"><a className="hover:underline">Contact</a></Link></li>
+                <li><Link href="#features" className="hover:underline">Features</Link></li>
+                <li><Link href="/builder" className="hover:underline">Builder</Link></li>
+                <li><Link href="/products" className="hover:underline">Products</Link></li>
+                <li><Link href="#contact" className="hover:underline">Contact</Link></li>
             </ul>
         </nav>
         </div>
       </header>
-
       {/* Hero Section */}
       <section className="bg-gray-700 text-white py-20 text-center">
         <div className="container mx-auto px-6">
@@ -25,14 +24,15 @@ export default function Home() {
           <p className="text-lg mb-6">
             Customize every component of your firearm with ease and precision.
           </p>
-          <Link href="/builder">
-            <a className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+          <Link
+            href="/builder"
+            className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+            
               Get Started
-            </a>
+            
           </Link>
         </div>
       </section>
-
       {/* Features Section */}
       <section id="features" className="py-20">
         <div className="container mx-auto px-6 text-center">
@@ -59,7 +59,6 @@ export default function Home() {
           </div>
         </div>
       </section>
-
       {/* About Section */}
       <section id="about" className="bg-gray-200 py-20">
         <div className="container mx-auto px-6 text-center">
@@ -71,7 +70,6 @@ export default function Home() {
           </p>
         </div>
       </section>
-
       {/* Contact Section */}
       <section id="contact" className="py-20">
         <div className="container mx-auto px-6 text-center">
@@ -79,20 +77,21 @@ export default function Home() {
           <p className="text-gray-700 mb-6">
             Have questions or feedback? We’d love to hear from you!
           </p>
-          <Link href="mailto:support@firearmbuilder.com">
-            <a className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+          <Link
+            href="mailto:support@firearmbuilder.com"
+            className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+            
               Email Us
-            </a>
+            
           </Link>
         </div>
       </section>
-
       {/* Footer Section */}
       <footer className="bg-gray-800 text-white py-4">
         <div className="container mx-auto px-6 text-center">
           <p>&copy; {new Date().getFullYear()} Firearm Builder. All rights reserved.</p>
         </div>
       </footer>
-    </div>
+    </div>)
   );
 }
\ No newline at end of file