diff --git a/packages/client/src/hooks/usePeriodChart.ts b/packages/client/src/hooks/usePeriodChart.ts
index a4310642..4a149341 100644
--- a/packages/client/src/hooks/usePeriodChart.ts
+++ b/packages/client/src/hooks/usePeriodChart.ts
@@ -1,11 +1,6 @@
 import { getCandleByPeriod } from '@/api/market';
-<<<<<<< HEAD
 import { Candle, CandlePeriod, InfiniteCandle } from '@/types/chart';
 import { useSuspenseInfiniteQuery } from '@tanstack/react-query';
-=======
-import { CandlePeriod } from '@/types/chart';
-import { useSuspenseQuery } from '@tanstack/react-query';
->>>>>>> 9ed63c1 (refactor: 타입명 명확히 수정)
 
 export function usePeriodChart(
 	market: string,