Fix conflicts after rebase from main

Author: marjisound

dotcom-rendering/src/components/Card/Card.tsx

@@ -862,7 +862,6 @@ export const Card = ({
 	return (
 		<CardWrapper
 			format={format}
-			contextFormat={contextFormat}
 			showTopBarDesktop={showTopBarDesktop}
 			showTopBarMobile={showTopBarMobile}
 			containerPalette={containerPalette}

dotcom-rendering/src/components/Card/components/CardWrapper.tsx

@@ -9,7 +9,6 @@ import { FormatBoundary } from '../../FormatBoundary';
 type Props = {
 	children: React.ReactNode;
 	format: ArticleFormat;
-	contextFormat?: ArticleFormat;
 	showTopBarDesktop: boolean;
 	showTopBarMobile: boolean;
 	containerPalette?: DCRContainerPalette;
@@ -90,7 +89,7 @@ const mobileTopBarStyles = (colour: string) => css`
 `;
 const desktopTopBarStyles = (colour: string) => css`
 	${from.tablet} {
-		${topBarStyles}
+		${topBarStyles(colour)}
 	}
 `;