fix: merge errors

src/components/CountryFlag.tsx

@@ -1,40 +0,0 @@
-import { Box, Typography } from '@mui/material';
-import { useTranslation } from 'react-i18next';
-// TODO: move countries outside of feature directory
-import { countries } from '@/features/authentication/data/Countries';
-
-interface CountryFlagProps {
-  code: string;
-}
-
-export function CountryFlag({ code }: CountryFlagProps) {
-  const { t } = useTranslation();
-
-  const countryObj = code ? countries.find((c) => c.code === code) : null;
-
-  if (!countryObj) {
-    return null;
-  }
-
-  const displayName = t(countryObj.label);
-  const flagUrl = `https://flagcdn.com/w40/${countryObj.code.toLowerCase()}.png`;
-
-  return (
-    <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
-      <Box
-        component="img"
-        loading="lazy"
-        src={flagUrl}
-        alt={displayName}
-        sx={{
-          width: 24,
-          height: 16,
-          borderRadius: 0.5,
-          border: '1px solid',
-          borderColor: 'divider',
-        }}
-      />
-      <Typography variant="body2">{displayName}</Typography>
-    </Box>
-  );
-}

src/components/index.ts

@@ -0,0 +1 @@
+export * from './layout/Layout';