diff --git a/adminfront/src/lib/utils.ts b/adminfront/src/lib/utils.ts
index 084e99ce..93c113b3 100644
--- a/adminfront/src/lib/utils.ts
+++ b/adminfront/src/lib/utils.ts
@@ -1,8 +1,10 @@
 import { type ClassValue, clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 
+import { mergeClassNames } from "../../../common/core/utils";
+
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
+  return mergeClassNames(twMerge, [clsx(inputs)]);
 }
 
 export function generateSecurePassword(length = 16): string {
diff --git a/common/core/utils/index.ts b/common/core/utils/index.ts
new file mode 100644
index 00000000..010050f4
--- /dev/null
+++ b/common/core/utils/index.ts
@@ -0,0 +1,6 @@
+export function mergeClassNames(
+  mergeFn: (...classNames: string[]) => string,
+  classNames: string[],
+) {
+  return mergeFn(...classNames);
+}
diff --git a/devfront/src/lib/utils.ts b/devfront/src/lib/utils.ts
index 365058ce..8715786b 100644
--- a/devfront/src/lib/utils.ts
+++ b/devfront/src/lib/utils.ts
@@ -1,6 +1,8 @@
 import { type ClassValue, clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 
+import { mergeClassNames } from "../../../common/core/utils";
+
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
+  return mergeClassNames(twMerge, [clsx(inputs)]);
 }
diff --git a/orgfront/src/lib/utils.ts b/orgfront/src/lib/utils.ts
index 365058ce..8715786b 100644
--- a/orgfront/src/lib/utils.ts
+++ b/orgfront/src/lib/utils.ts
@@ -1,6 +1,8 @@
 import { type ClassValue, clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 
+import { mergeClassNames } from "../../../common/core/utils";
+
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
+  return mergeClassNames(twMerge, [clsx(inputs)]);
 }