resolved

src/app/layout.tsx

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { ReactNode } from "react";
 
 type Props = {
@@ -6,4 +7,40 @@ type Props = {
 
 export default function RootLayout({ children }: Props) {
   return children;
+=======
+import type { Metadata } from "next";
+import "./globals.scss";
+import "./App.scss";
+// import "@/shared/fonts/fonts.scss";
+import { Providers } from "./Providers";
+import Navbar from "@/widgets/Navbar/Navbar";
+import Footer from "@/widgets/Footer/Footer";
+import { GoogleAnalytics } from '@next/third-parties/google'
+
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html lang="en">
+      <head>
+</head>
+      <body>
+        <Providers>
+          <Navbar />
+          <div className="app">{children}</div>
+          <Footer />
+        </Providers>
+      </body>
+
+      {/*
+
+      Disable google analytics in uat
+      <GoogleAnalytics gaId={process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS || ""} />
+  */}
+    </html>
+  );
+>>>>>>> d1440f3907ca91b29db2977f043e44f54993aeb1
 }