fix :: conflict 해결

src/apis/user/index.ts

@@ -1,9 +1,9 @@
-import { useToastStore, Toast } from "@team-return/design-system";
 import { useMutation } from "@tanstack/react-query";
+import { useToastStore } from "@team-return/design-system";
+import axios, { AxiosError } from "axios";
 import { useRouter } from "next/navigation";
 import { useCookies } from "react-cookie";
 import { RequestBody, ResponseBody } from "./type";
-import axios, { AxiosError } from "axios";
 
 const router = "/users";
 

src/components/SuggestionHeader.tsx

@@ -9,11 +9,7 @@ interface PropsType {
 }
 
 export default function SuggestionHeader({ listType }: PropsType) {
-<<<<<<< HEAD
-  const { data: profile } = MyProfile();
-=======
-  const { data } = useMyProfile();
->>>>>>> develop
+  const { data: profile } = useMyProfile();
 
   const suggestionHeaderDummy = {
     Company: {

src/components/common/Header.tsx

@@ -14,11 +14,7 @@ function Header() {
     return null;
   }
 
-<<<<<<< HEAD
-  const { data: profile } = MyProfile();
-=======
-  const profile = useMyProfile();
->>>>>>> develop
+  const { data: profile } = useMyProfile();
 
   return (
     <div

src/components/common/SearchDropDown.tsx

@@ -3,17 +3,11 @@
 import { useGetCode } from "@/apis/code";
 import { useDropDown } from "@/hook/useDropDown";
 import useForm from "@/hook/useForm";
-<<<<<<< HEAD
-import Chips from "./Chips";
-import { GetCode } from "@/apis/code";
-import { TechCodeResponensType } from "@/util/type/type";
-=======
 import { RecruitmentsQueryType } from "@/hook/useQueryString/type";
 import { useQueryString } from "@/hook/useQueryString/useQueryString";
-import { TechCodeResponensType } from "@/util/type";
+import { TechCodeResponensType } from "@/util/type/type";
 import { Icon } from "@team-return/design-system";
 import React, { useEffect, useState } from "react";
->>>>>>> develop
 import GhostBtn from "./Button/GhostBtn";
 import Chips from "./Chips";
 import TextFiled from "./TextFiled";

src/components/company/CompanyTitle.tsx

@@ -1,15 +1,9 @@
 "use client";
 
-<<<<<<< HEAD
 import { getCompanyKebabItems } from "@/util/object/kebabMenuItems";
 import { KebabItemType } from "@/util/type/kebabMenu";
 import Image from "next/image";
 import KebabMenu from "../common/Dropdown/KebabMenu";
-=======
-import { useDropDown } from "@/hook/useDropDown";
-import { Icon } from "@team-return/design-system";
-import Image from "next/image";
->>>>>>> develop
 
 interface PropsType {
   business_number?: string;
@@ -28,14 +22,10 @@ export default function CompanyTitle({
   onClickInterview,
   children,
 }: PropsType) {
-<<<<<<< HEAD
-  const kebabItems = getCompanyKebabItems(
+  const kebabItems: KebabItemType[] = getCompanyKebabItems(
     onClickRecruitments,
     onClickInterview
   );
-=======
-  const { DropDownComponent, toggleDropdown, closeDropDown } = useDropDown();
->>>>>>> develop
 
   return (
     <div className="flex items-center justify-between w-full">