resoled conflicts

src/features/GoogleButton/GoogleButton.tsx

@@ -4,10 +4,9 @@ import Image from "next/image";
 import "./GoogleButton.scss";
 import google from "./icons/google.svg";
 import { useSearchParams } from "next/navigation";
-import { signIn, useSession } from "next-auth/react";
+import { signIn } from "next-auth/react";
 
 const GoogleButton = () => {
-  const session = useSession();
   const searchParams = useSearchParams();
   const callbackUrl =
     searchParams.get("callbackUrl") || "/profile/personal";