diff --git a/frontend/src/app/jobs/[id]/apply/page.tsx b/frontend/src/app/jobs/[id]/apply/page.tsx
index 97f6427..aae8117 100644
--- a/frontend/src/app/jobs/[id]/apply/page.tsx
+++ b/frontend/src/app/jobs/[id]/apply/page.tsx
@@ -50,12 +50,6 @@ import { useTranslation } from "@/lib/i18n";
 import { getCurrentUser } from "@/lib/auth";
 
 
-<<<<<<< HEAD
-
-export const runtime = 'edge';
-
-=======
->>>>>>> dev
 export default function JobApplicationPage({
   params,
 }: {