diff --git a/packages/main/src/router/Layout/index.tsx b/packages/main/src/router/Layout/index.tsx
index 8b72078b..fc65dffb 100644
--- a/packages/main/src/router/Layout/index.tsx
+++ b/packages/main/src/router/Layout/index.tsx
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 import { Header, Modal } from "./components";
 import { useState } from "react";
 export * from "./ViewLayout";
@@ -14,20 +13,6 @@ export const Layout = ({ children }: IProp) => {
       <Header setOpened={setOpened} />
       <Modal opened={opened} setOpened={setOpened} />
       {children}
-=======
-// import { useState } from "react";
-import { Outlet } from "react-router-dom";
-// import { Header, Modal } from "./components";
-
-export const Layout = () => {
-  // const [opened, setOpened] = useState(false);
-
-  return (
-    <div className="w-full h-fit bg-[#222222]">
-      {/* <Header setOpened={setOpened} /> */}
-      {/* <Modal opened={opened} setOpened={setOpened} /> */}
-      <Outlet />
->>>>>>> Stashed changes
     </div>
   );
 };