fix: solve conflicts on merge main

package.json

@@ -64,18 +64,18 @@
     "@tanstack/react-query": "^5.37.1",
     "app-icon-badge": "^0.0.15",
     "axios": "^1.7.1",
-    "expo": "~51.0.31",
+    "expo": "~51.0.38",
     "expo-constants": "~16.0.2",
-    "expo-dev-client": "~4.0.26",
+    "expo-dev-client": "~4.0.28",
     "expo-font": "~12.0.10",
-    "expo-image": "~1.12.15",
+    "expo-image": "~1.13.0",
     "expo-linking": "~6.3.1",
     "expo-localization": "~15.0.3",
     "expo-router": "~3.5.23",
-    "expo-splash-screen": "0.27.5",
+    "expo-splash-screen": "0.27.6",
     "expo-status-bar": "~1.12.1",
     "expo-system-ui": "~3.0.7",
-    "expo-updates": "~0.25.24",
+    "expo-updates": "~0.25.27",
     "i18next": "^22.5.1",
     "lodash.memoize": "^4.1.2",
     "moti": "^0.28.1",
@@ -98,6 +98,7 @@
     "react-native-svg": "15.2.0",
     "react-native-web": "~0.19.11",
     "react-query-kit": "^3.3.0",
+    "tailwind-merge": "^2.5.4",
     "tailwind-variants": "^0.1.20",
     "zod": "^3.23.8",
     "zustand": "^4.5.2"