diff --git a/app/[locale]/(protected)/contributor/agenda-setting/event-modal.tsx b/app/[locale]/(protected)/contributor/agenda-setting/event-modal.tsx
index c6016199..e4dffbcc 100644
--- a/app/[locale]/(protected)/contributor/agenda-setting/event-modal.tsx
+++ b/app/[locale]/(protected)/contributor/agenda-setting/event-modal.tsx
@@ -351,17 +351,10 @@ const EventModal = ({
       id: detailData?.id,
       title: data.title,
       description: data.description,
-<<<<<<< HEAD
-      agendaType: agendaTypeList.join(","), 
-      assignedToLevel: assignedToLevelList.join(","),
-      startDate: format(startDate, "yyyy-MM-dd"),
-      endDate: format(endDate, "yyyy-MM-dd"),
-=======
       agendaType: agendaTypeList.join(","), // <-- ubah array jadi string
       assignedToLevel: assignedToLevelList.join(","), // <-- ubah array jadi string
       startDate: date?.from ? format(date.from, "yyyy-MM-dd") : null,
       endDate: date?.to ? format(date.to, "yyyy-MM-dd") : null,
->>>>>>> 249de7b5958cf7d04ba12a114318edbc1c614c6a
     };
 
     console.log("Submitted Data:", reqData);