merge conflict fixed

src/components/Brand/BrandsList.tsx

@@ -4,6 +4,8 @@ import { brandType } from "src/types/brandType";
 import Brand from "./brand";
 import AddBrand from "./addBrand";
 import { addBrand, deleteBrand, editBrand } from "../../actions/brandActions";
+import Footer from "@components/site/Footer";
+
 interface Props {
   brands: brandType[];
 }
@@ -50,6 +52,7 @@ const BrandsList: FC<Props> = ({ brands }) => {
       </div>
       {/* Adding brand component for creating new brand */}
       <AddBrand createBrand={createBrand} />
+      <Footer/>
     </main>
   );
 };

src/components/UserRegistration/index.tsx

@@ -1,15 +1,9 @@
 // components/UserRegistration.js
 import { useState } from 'react';
-import { useToast } from '@chakra-ui/react';
-import {
-  FormControl,
-  FormLabel,
-  Input,
-  Button,
-  Stack,
-  Heading,
-} from '@chakra-ui/react';
-import { drizzle } from 'drizzle-orm';
+import { useToast } from '@chakra-ui/toast';
+import { FormControl, FormLabel, } from '@chakra-ui/form-control';
+import { Input, Button, Stack, Heading } from '@chakra-ui/react';
+import { drizzle } from 'drizzle-orm/node-postgres';
 
 export default function UserRegistration() {
   const [formData, setFormData] = useState({