diff --git a/src/index.tsx b/src/index.tsx
index 0b4b24e..99c1f36 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,3 +1,5 @@
+import { clsx } from "clsx"
+import { twMerge } from "tailwind-merge"
 // PURPOSE: Personal-records primitives — kind-typed record cards, group
 //          sections with privacy framing, field tables and spec-driven
 //          field inputs, tier badges, the record→Markdown renderer, and a
@@ -47,7 +49,7 @@ import {
 /* ------------------------------------------------------------------ */
 
 function cn(...classes: (string | false | null | undefined)[]): string {
-  return classes.filter(Boolean).join(" ");
+  return twMerge(clsx(classes))
 }
 
 /* ------------------------------------------------------------------ */