diff --git a/packages/admin/blocks-admin/src/blocks/YouTubeVideoBlock.tsx b/packages/admin/blocks-admin/src/blocks/YouTubeVideoBlock.tsx
index 8c109e4801..f8db02ba10 100644
--- a/packages/admin/blocks-admin/src/blocks/YouTubeVideoBlock.tsx
+++ b/packages/admin/blocks-admin/src/blocks/YouTubeVideoBlock.tsx
@@ -37,11 +37,7 @@ export const YouTubeVideoBlock: BlockInterface,
-<<<<<<< HEAD
- defaultValues: () => ({ youtubeIdentifier: "", autoplay: false, showControls: false, loop: false }),
-=======
- defaultValues: () => ({ autoplay: false, showControls: false, loop: false, aspectRatio: "16X9" }),
->>>>>>> main
+ defaultValues: () => ({ autoplay: false, showControls: false, loop: false }),
category: BlockCategory.Media,
diff --git a/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx b/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx
index 6919badc03..b9460c2439 100644
--- a/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx
+++ b/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx
@@ -1,9 +1,5 @@
import { gql, useMutation } from "@apollo/client";
-<<<<<<< HEAD
-import { AppHeaderDropdown, Loading } from "@comet/admin";
-=======
import { AppHeaderDropdown, AppHeaderDropdownProps, Loading } from "@comet/admin";
->>>>>>> main
import { Account, Info, Logout } from "@comet/admin-icons";
import { Box, Button as MUIButton, useMediaQuery, useTheme } from "@mui/material";
import { styled } from "@mui/material/styles";
@@ -53,11 +49,7 @@ export function UserHeaderItem(props: UserHeaderItemProps): React.ReactElement {
const [signOut, { loading: isSigningOut }] = useMutation(signOutMutation);
return (
-<<<<<<< HEAD
- : user.name} startIcon={isMobile ? undefined : }>
-=======
- }>
->>>>>>> main
+ : user.name)} startIcon={isMobile ? undefined : }>