B2B-30: fix conflicts

app/home/[account]/layout.tsx

@@ -30,7 +30,7 @@ function TeamWorkspaceLayout({ children, params }: TeamWorkspaceLayoutProps) {
     return <SidebarLayout account={account}>{children}</SidebarLayout>;
   }
 
-  return  <HeaderLayout account={account}>{children}</HeaderLayout>;
+  return <HeaderLayout account={account}>{children}</HeaderLayout>;
 }
 
 function SidebarLayout({
@@ -113,7 +113,32 @@ function HeaderLayout({
           </div>
         </PageMobileNavigation>
 
-        {children}
+        <SidebarProvider defaultOpen>
+          <Page style={'sidebar'}>
+            <PageNavigation>
+              <TeamAccountLayoutSidebar
+                account={account}
+                accountId={data.account.id}
+                accounts={accounts}
+                user={data.user}
+              />
+            </PageNavigation>
+
+            <PageMobileNavigation className={'flex items-center justify-between'}>
+              <AppLogo />
+
+              <div className={'flex space-x-4'}>
+                <TeamAccountLayoutMobileNavigation
+                  userId={data.user.id}
+                  accounts={accounts}
+                  account={account}
+                />
+              </div>
+            </PageMobileNavigation>
+
+            {children}
+          </Page>
+        </SidebarProvider>
       </Page>
     </TeamAccountWorkspaceContextProvider>
   );