diff --git a/apps/portal/src/server/router/offers/offers-analysis-router.ts b/apps/portal/src/server/router/offers/offers-analysis-router.ts
index 0c084763..4ae5241f 100644
--- a/apps/portal/src/server/router/offers/offers-analysis-router.ts
+++ b/apps/portal/src/server/router/offers/offers-analysis-router.ts
@@ -1,19 +1,4 @@
 import { z } from 'zod';
-<<<<<<< HEAD
-=======
-import type {
-  City,
-  Company,
-  Country,
-  OffersBackground,
-  OffersCurrency,
-  OffersFullTime,
-  OffersIntern,
-  OffersOffer,
-  OffersProfile,
-  State,
-} from '@prisma/client';
->>>>>>> BryannYeap/location
 import { TRPCError } from '@trpc/server';
 
 import { generateAnalysis } from '~/utils/offers/analysisGeneration';
diff --git a/apps/portal/src/utils/offers/analysisGeneration.ts b/apps/portal/src/utils/offers/analysisGeneration.ts
index 4d80cc8d..d9221a08 100644
--- a/apps/portal/src/utils/offers/analysisGeneration.ts
+++ b/apps/portal/src/utils/offers/analysisGeneration.ts
@@ -1,6 +1,8 @@
 import type { Session } from 'next-auth';
 import type {
+  City,
   Company,
+  Country,
   OffersBackground,
   OffersCurrency,
   OffersFullTime,
@@ -9,6 +11,7 @@ import type {
   OffersProfile,
   Prisma,
   PrismaClient,
+  State,
 } from '@prisma/client';
 import { TRPCError } from '@trpc/server';