merged conflict

src/app/layout.tsx

@@ -2,7 +2,7 @@ import { Provider } from "../components/ui/provider"
 import "../styles/globals.css";
 export const metadata = {
   title: 'Ballistic Builder',
-  description: 'Product of Forward Group, LLC',
+  description: 'Freedom On',
 }
 
 export default function RootLayout(props: { children: React.ReactNode }) {

src/app/page.tsx

@@ -4,14 +4,14 @@ import Header from "../components/Header";
 import Hero from "../components/Hero";
 import Contact from "../components/Contact";
 import Footer from "../components/Footer ";
+import Navbar from "../components/Navbar"
 import { ChakraProvider } from "@chakra-ui/react";
-import { getData } from "../actions/brandActions";
-import Brands from "../components/Brand/brands";
+
 
 export default async function Home() {
-  const data = await getData();
   return (
     <div className="bg-gray-100 min-h-screen flex flex-col">
+      <Navbar />
       <Header /> 
       <Hero />
       <FeaturesSection />