diff --git a/front/pages/w/[wId]/builder/assistants/index.tsx b/front/pages/w/[wId]/builder/assistants/index.tsx
index 7cef65e01e59..f4a76a4115fa 100644
--- a/front/pages/w/[wId]/builder/assistants/index.tsx
+++ b/front/pages/w/[wId]/builder/assistants/index.tsx
@@ -3,10 +3,11 @@ import {
   Button,
   Cog6ToothIcon,
   ContextItem,
-  Page,
+  PageHeader,
   PencilSquareIcon,
   PlusIcon,
   RobotIcon,
+  SectionHeader,
   SliderToggle,
 } from "@dust-tt/sparkle";
 import { GetServerSideProps, InferGetServerSidePropsType } from "next";
@@ -112,7 +113,6 @@ export default function AssistantsBuilder({
       topNavigationCurrent="settings"
       subNavigation={subNavigationAdmin({ owner, current: "assistants" })}
     >
-<<<<<<< HEAD
       <PageHeader
         title="Assistants"
         icon={RobotIcon}
@@ -203,92 +203,18 @@ export default function AssistantsBuilder({
                       void router.push(
                         `/w/${owner.sId}/builder/assistants/${agent.sId}`
                       );
-=======
-      <Page.Vertical gap="xl" align="stretch">
-        <Page.Header
-          title="Assistants"
-          icon={RobotIcon}
-          description="Create, manage and deploy Assistants to your collaborators."
-        />
-        <Page.SectionHeader
-          title="Dust Assistants"
-          description='Assistants built by Dust for multiple use&nbsp;cases. For instance, use "@help" for any&nbsp;question Dust related, use&nbsp;the&nbsp;handle "@notion" to&nbsp;target specifically knowledge on&nbsp;Notion…'
-        />
-        <ContextItem.List>
-          {dustAgents.map((agent) => (
-            <ContextItem
-              key={agent.sId}
-              title={`@${agent.name}`}
-              visual={
-                <Avatar visual={<img src={agent.pictureUrl} />} size={"sm"} />
-              }
-              action={
-                agent.sId !== "helper" ? (
-                  <SliderToggle
-                    size="md"
-                    onClick={async () => {
-                      await handleToggleAgentStatus(agent);
->>>>>>> 8f36eb7c (Polishing Admin Pages)
                     }}
-                    selected={agent.status === "active"}
-                    disabled={
-                      agent.status === "disabled_missing_datasource" ||
-                      !isBuilder
-                    }
                   />
-                ) : null
-              }
-            >
-              <ContextItem.Description>
-                <div className="text-element-700">{agent.description}</div>
-              </ContextItem.Description>
-            </ContextItem>
-          ))}
-        </ContextItem.List>
-        <Page.SectionHeader
-          title="Custom Assistants"
-          description="Build your Assistant, tailored to your needs. Write specific&nbsp;instructions, select&nbsp;specific data sources to&nbsp;get better&nbsp;answers."
-          action={{
-            label: "Create a new Assistant",
-            variant: "primary",
-            icon: PlusIcon,
-            size: "sm",
-            disabled: !isBuilder,
-            onClick: () => {
-              void router.push(`/w/${owner.sId}/builder/assistants/new`);
-            },
-          }}
-        />
-        <ContextItem.List className="mt-8  text-element-900">
-          {workspaceAgents.map((agent) => (
-            <ContextItem
-              key={agent.sId}
-              title={`@${agent.name}`}
-              visual={
-                <Avatar visual={<img src={agent.pictureUrl} />} size={"sm"} />
-              }
-              action={
-                <Button
-                  variant="secondary"
-                  icon={PencilSquareIcon}
-                  label="Edit"
-                  size="sm"
-                  disabled={!isBuilder}
-                  onClick={() => {
-                    void router.push(
-                      `/w/${owner.sId}/builder/assistants/${agent.sId}`
-                    );
-                  }}
-                />
-              }
-            >
-              <ContextItem.Description>
-                <div className="text-element-700">{agent.description}</div>
-              </ContextItem.Description>
-            </ContextItem>
-          ))}
-        </ContextItem.List>
-      </Page.Vertical>
+                }
+              >
+                <ContextItem.Description>
+                  <div className="text-element-700">{agent.description}</div>
+                </ContextItem.Description>
+              </ContextItem>
+            ))}
+          </ContextItem.List>
+        </div>
+      </div>
     </AppLayout>
   );
 }
diff --git a/front/pages/w/[wId]/builder/data-sources/managed.tsx b/front/pages/w/[wId]/builder/data-sources/managed.tsx
index ef21a9a37636..463917e371cc 100644
--- a/front/pages/w/[wId]/builder/data-sources/managed.tsx
+++ b/front/pages/w/[wId]/builder/data-sources/managed.tsx
@@ -9,6 +9,7 @@ import {
   GithubLogo,
   NotionLogo,
   Page,
+  PageHeader,
   SlackLogo,
 } from "@dust-tt/sparkle";
 import Nango from "@nangohq/frontend";
@@ -347,66 +348,48 @@ export default function DataSourcesView({
         current: "data_sources_managed",
       })}
     >
-      <Page.Vertical gap="xl" align="stretch">
-        <Page.Header
-          title="Connections"
-          icon={CloudArrowLeftRightIcon}
-          description="Manage connections to your products and the real-time data feeds Dust has access to."
-        />
+      <Page.Vertical gap="lg" align="stretch">
+        <div className="flex flex-col gap-8 pb-4">
+          <PageHeader
+            title="Connections"
+            icon={CloudArrowLeftRightIcon}
+            description="Manage connections to your products and the real-time data feeds Dust has access to."
+          />
 
-        <ContextItem.List>
-          {localIntegrations.map((ds) => {
-            return (
-              <ContextItem
-                key={
-                  ds.dataSourceName ||
-                  `managed-to-connect-${ds.connectorProvider}`
-                }
-                title={ds.name}
-                visual={
-                  <ContextItem.Visual
-                    visual={(() => {
-                      switch (ds.connectorProvider) {
-                        case "slack":
-                          return SlackLogo;
-                        case "notion":
-                          return NotionLogo;
-                        case "github":
-                          return GithubLogo;
-                        case "google_drive":
-                          return DriveLogo;
-                        default:
-                          return SlackLogo;
-                      }
-                    })()}
-                  />
-                }
-                action={
-                  <Button.List>
-                    {(() => {
-                      const disabled =
-                        !ds.isBuilt ||
-                        isLoadingByProvider[
-                          ds.connectorProvider as ConnectorProvider
-                        ] ||
-                        !isAdmin;
-                      const onclick = canUseManagedDataSources
-                        ? async () => {
-                            await handleEnableManagedDataSource(
-                              ds.connectorProvider as ConnectorProvider,
-                              ds.setupWithSuffix
-                            );
-                          }
-                        : () => {
-                            window.alert(
-                              "Managed Data Sources are only available on our paid plans. Contact us at team@dust.tt to get access."
-                            );
-                          };
-                      const label = !ds.isBuilt
-                        ? "Coming soon"
-                        : !isLoadingByProvider[
+          <ContextItem.List>
+            {localIntegrations.map((ds) => {
+              return (
+                <ContextItem
+                  key={
+                    ds.dataSourceName ||
+                    `managed-to-connect-${ds.connectorProvider}`
+                  }
+                  title={ds.name}
+                  visual={
+                    <ContextItem.Visual
+                      visual={(() => {
+                        switch (ds.connectorProvider) {
+                          case "slack":
+                            return SlackLogo;
+                          case "notion":
+                            return NotionLogo;
+                          case "github":
+                            return GithubLogo;
+                          case "google_drive":
+                            return DriveLogo;
+                          default:
+                            return SlackLogo;
+                        }
+                      })()}
+                    />
+                  }
+                  action={
+                    <Button.List>
+                      {(() => {
+                        const disabled =
+                          !ds.isBuilt ||
+                          isLoadingByProvider[
                             ds.connectorProvider as ConnectorProvider
-<<<<<<< HEAD
                           ] ||
                           !isAdmin;
                         const onclick = async () => {
@@ -495,56 +478,41 @@ export default function DataSourcesView({
                                           , including the Limited Use
                                           requirements.
                                         </div>
-=======
-                          ] && !ds.fetchConnectorError
-                        ? "Connect"
-                        : "Connecting...";
-                      if (!ds || !ds.connector) {
-                        return (
-                          <>
-                            {ds.connectorProvider !== "google_drive" && (
-                              <Button
-                                variant="primary"
-                                icon={CloudArrowLeftRightIcon}
-                                disabled={disabled}
-                                onClick={onclick}
-                                label={label}
-                              />
-                            )}
-                            {ds.connectorProvider === "google_drive" && (
-                              <DropdownMenu>
-                                <DropdownMenu.Button>
-                                  <Button
-                                    variant="primary"
-                                    label={label}
-                                    disabled={disabled}
-                                    icon={CloudArrowLeftRightIcon}
-                                  />
-                                </DropdownMenu.Button>
-                                <DropdownMenu.Items
-                                  origin="topRight"
-                                  width={350}
-                                >
-                                  <div className="flex flex-col gap-y-4 p-4">
-                                    <div className="flex flex-col gap-y-2">
-                                      <div className="grow text-sm font-medium text-element-800">
-                                        Disclosure
->>>>>>> 8f36eb7c (Polishing Admin Pages)
                                       </div>
-                                      <div className="text-sm font-normal text-element-700">
-                                        Dust's use of information received from
-                                        the Google APIs will adhere to{" "}
-                                        <Link
-                                          className="s-text-action-500"
-                                          href="https://developers.google.com/terms/api-services-user-data-policy#additional_requirements_for_specific_api_scopes"
-                                        >
-                                          Google API Services User Data Policy
-                                        </Link>
-                                        , including the Limited Use
-                                        requirements.
+
+                                      <div className="flex flex-col gap-y-2">
+                                        <div className="grow text-sm font-medium text-element-800">
+                                          Notice on data processing
+                                        </div>
+                                        <div className="text-sm font-normal text-element-700">
+                                          By connecting Google Drive, you
+                                          acknowledge and agree that within your
+                                          Google Drive, the data contained in
+                                          the files and folders that you choose
+                                          to synchronize with Dust will be
+                                          transmitted to third-party entities,
+                                          including but not limited to
+                                          Artificial Intelligence (AI) model
+                                          providers, for the purpose of
+                                          processing and analysis. This process
+                                          is an integral part of the
+                                          functionality of our service and is
+                                          subject to the terms outlined in our
+                                          Privacy Policy and Terms of Service.
+                                        </div>
+                                      </div>
+                                      <div className="flex justify-center">
+                                        <DropdownMenu.Button>
+                                          <Button
+                                            variant="secondary"
+                                            icon={CloudArrowLeftRightIcon}
+                                            disabled={disabled}
+                                            onClick={onclick}
+                                            label="Acknowledge and Connect"
+                                          />
+                                        </DropdownMenu.Button>
                                       </div>
                                     </div>
-<<<<<<< HEAD
                                   </DropdownMenu.Items>
                                 </DropdownMenu>
                               )}
@@ -623,114 +591,6 @@ export default function DataSourcesView({
             })}
           </ContextItem.List>
         </div>
-=======
-
-                                    <div className="flex flex-col gap-y-2">
-                                      <div className="grow text-sm font-medium text-element-800">
-                                        Notice on data processing
-                                      </div>
-                                      <div className="text-sm font-normal text-element-700">
-                                        By connecting Google Drive, you
-                                        acknowledge and agree that within your
-                                        Google Drive, the data contained in the
-                                        files and folders that you choose to
-                                        synchronize with Dust will be
-                                        transmitted to third-party entities,
-                                        including but not limited to Artificial
-                                        Intelligence (AI) model providers, for
-                                        the purpose of processing and analysis.
-                                        This process is an integral part of the
-                                        functionality of our service and is
-                                        subject to the terms outlined in our
-                                        Privacy Policy and Terms of Service.
-                                      </div>
-                                    </div>
-                                    <div className="flex justify-center">
-                                      <DropdownMenu.Button>
-                                        <Button
-                                          variant="secondary"
-                                          icon={CloudArrowLeftRightIcon}
-                                          disabled={disabled}
-                                          onClick={onclick}
-                                          label="Acknowledge and Connect"
-                                        />
-                                      </DropdownMenu.Button>
-                                    </div>
-                                  </div>
-                                </DropdownMenu.Items>
-                              </DropdownMenu>
-                            )}
-                          </>
-                        );
-                      } else {
-                        return (
-                          <Button
-                            variant="secondary"
-                            icon={Cog6ToothIcon}
-                            disabled={
-                              !ds.isBuilt ||
-                              isLoadingByProvider[
-                                ds.connectorProvider as ConnectorProvider
-                              ] ||
-                              // Can't manage or view if not (admin or not readonly (ie builder)).
-                              !(isAdmin || !readOnly)
-                            }
-                            onClick={() => {
-                              void router.push(
-                                `/w/${owner.sId}/builder/data-sources/${ds.dataSourceName}`
-                              );
-                            }}
-                            label={isAdmin ? "Manage" : "View"}
-                          />
-                        );
-                      }
-                    })()}
-                  </Button.List>
-                }
-              >
-                {ds && ds.connector && (
-                  <div className="mb-1 mt-2">
-                    {ds.fetchConnectorError ? (
-                      <Chip color="warning">errored</Chip>
-                    ) : (
-                      <>
-                        {!ds.connector.lastSyncSuccessfulTime ? (
-                          <Chip color="amber" isBusy>
-                            Synchronizing
-                            {ds.connector?.firstSyncProgress
-                              ? ` (${ds.connector?.firstSyncProgress})`
-                              : null}
-                          </Chip>
-                        ) : (
-                          <>
-                            <Chip color="slate">
-                              Last Sync ~ {ds.synchronizedAgo} ago
-                            </Chip>
-                          </>
-                        )}
-                      </>
-                    )}
-                  </div>
-                )}
-                <ContextItem.Description>
-                  <div className="text-sm text-element-700">
-                    {ds.description}
-                  </div>
-                </ContextItem.Description>
-              </ContextItem>
-            );
-          })}
-        </ContextItem.List>
-        <Page.Vertical>
-          <Page.H>Limitations</Page.H>
-          <Page.P variant="secondary">
-            Dust doesn't synchronize external files shared within a Notion page
-            or a Slack channel. On Google Drive, files with extracted text
-            bigger than 750KB are excluded. On GitHub, the code base is not
-            synchronized.
-          </Page.P>
-        </Page.Vertical>
->>>>>>> 8f36eb7c (Polishing Admin Pages)
       </Page.Vertical>
     </AppLayout>
   );
diff --git a/front/pages/w/[wId]/workspace/index.tsx b/front/pages/w/[wId]/workspace/index.tsx
index b7ee7d8d7d01..4d980299db07 100644
--- a/front/pages/w/[wId]/workspace/index.tsx
+++ b/front/pages/w/[wId]/workspace/index.tsx
@@ -1,10 +1,11 @@
 import {
   Button,
   CloudArrowDownIcon,
+  Cog6ToothIcon,
   DropdownMenu,
   Input,
   Page,
-  PlanetIcon,
+  PageHeader,
 } from "@dust-tt/sparkle";
 import { GetServerSideProps, InferGetServerSidePropsType } from "next";
 import React, { useCallback, useEffect, useState } from "react";
@@ -209,7 +210,6 @@ export default function WorkspaceAdmin({
       topNavigationCurrent="settings"
       subNavigation={subNavigationAdmin({ owner, current: "workspace" })}
     >
-<<<<<<< HEAD
       <Page.Vertical gap="xl" align="stretch">
         <PageHeader
           title="Workspace Settings"
@@ -250,42 +250,6 @@ export default function WorkspaceAdmin({
             <Page.P variant="secondary">
               Download monthly workspace activity details.
             </Page.P>
-=======
-      <Page.Vertical align="stretch" gap="xl">
-        <Page.Header
-          title="Workspace"
-          icon={PlanetIcon}
-          description="Use this page to manage your workspace."
-        />
-        <Page.SectionHeader
-          title="Workspace name"
-          description="Think GitHub repository names, short and memorable."
-        />
-        <Page.Horizontal>
-          <div className="flex-grow">
-            <Input
-              name="name"
-              placeholder="Workspace name"
-              value={workspaceName}
-              onChange={(x) => setWorkspaceName(x)}
-              error={workspaceNameError}
-              showErrorLabel={true}
-            />
-          </div>
-          <Button
-            variant="secondary"
-            disabled={disable || updating}
-            onClick={handleUpdateWorkspace}
-            label={updating ? "Updating..." : "Update"}
-          />
-        </Page.Horizontal>
-        {!!monthOptions.length && (
-          <>
-            <Page.SectionHeader
-              title="Workspace Activity"
-              description="Download monthly workspace activity details."
-            />
->>>>>>> 8f36eb7c (Polishing Admin Pages)
             <div className="align-center flex flex-row gap-2">
               <DropdownMenu>
                 <DropdownMenu.Button>
@@ -316,53 +280,7 @@ export default function WorkspaceAdmin({
                 }}
               />
             </div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-          </Page.Vertical>
-=======
-          </>
->>>>>>> 8f36eb7c (Polishing Admin Pages)
-=======
-          </>
-        )}
-        {!!monthOptions.length && (
-          <Page.Vertical align="stretch" gap="md">
-            <Page.SectionHeader
-              title="Workspace Activity"
-              description="Download monthly workspace activity details."
-            />
-            <Page.Horizontal>
-              <DropdownMenu>
-                <DropdownMenu.Button>
-                  <Button
-                    type="select"
-                    labelVisible={true}
-                    label={selectedMonth || ""}
-                    variant="secondary"
-                    size="sm"
-                  />
-                </DropdownMenu.Button>
-                <DropdownMenu.Items origin="topLeft">
-                  {monthOptions.map((month) => (
-                    <DropdownMenu.Item
-                      key={month}
-                      label={month}
-                      onClick={() => handleSelectMonth(month)}
-                    />
-                  ))}
-                </DropdownMenu.Items>
-              </DropdownMenu>
-              <Button
-                label="Download activity data"
-                icon={CloudArrowDownIcon}
-                variant="secondary"
-                onClick={() => {
-                  void handleDownload(selectedMonth);
-                }}
-              />
-            </Page.Horizontal>
           </Page.Vertical>
->>>>>>> 677de35a (Merge)
         )}
       </Page.Vertical>
     </AppLayout>