From 3077a3d8046ec4293a929a50ae2ea7ae75d1277e Mon Sep 17 00:00:00 2001
From: Klink <85062+dogmar@users.noreply.github.com>
Date: Tue, 19 Sep 2023 16:31:59 -0700
Subject: [PATCH] Fix build error

---
 src/components/Card.tsx           | 3 +--
 src/hooks/useFloatingDropdown.tsx | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 005be336..c39c5a85 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -2,7 +2,6 @@ import chroma from 'chroma-js'
 import { Div, type DivProps } from 'honorable'
 import { forwardRef } from 'react'
 import { type DefaultTheme, useTheme } from 'styled-components'
-import { type Merge } from 'type-fest'
 import { memoize } from 'lodash-es'
 
 import { type SeverityExt, sanitizeSeverity } from '../types'
@@ -40,7 +39,7 @@ type BaseCardProps = {
   severity?: SeverityExt
 }
 
-type CardProps = Merge<DivProps, BaseCardProps>
+type CardProps = DivProps & BaseCardProps
 
 const fillToNeutralBgC = {
   0: 'fill-one',
diff --git a/src/hooks/useFloatingDropdown.tsx b/src/hooks/useFloatingDropdown.tsx
index e26599f1..1132dcb7 100644
--- a/src/hooks/useFloatingDropdown.tsx
+++ b/src/hooks/useFloatingDropdown.tsx
@@ -40,7 +40,7 @@ export function useFloatingDropdown({
       offset(theme.spacing.xxsmall),
       size({
         padding: sizePadding,
-        apply(args) {
+        apply(args: any) {
           const { elements, availableHeight, rects } = args
           const maxW =
             typeof width === 'string' && width