diff --git a/src/components/Calendar/CalendarSelection.tsx b/src/components/Calendar/CalendarSelection.tsx
index 7a03081..550dc6f 100644
--- a/src/components/Calendar/CalendarSelection.tsx
+++ b/src/components/Calendar/CalendarSelection.tsx
@@ -215,7 +215,6 @@ function CalendarSelector({
     handleClose();
   };
   return (
-<<<<<<< HEAD
     <>
       <div>
         <label>
@@ -253,23 +252,5 @@ function CalendarSelector({
         handleDeleteConfirm={handleDeleteConfirm}
       />
     </>
-=======
-    <div key={id}>
-      <label>
-        <Checkbox
-          style={{
-            color: calendars[id].color,
-          }}
-          size="small"
-          checked={selectedCalendars.includes(id)}
-          onChange={() => handleCalendarToggle(id)}
-        />
-        {calendars[id].name}
-      </label>
-      <IconButton onClick={() => setOpen()}>
-        <MoreVertIcon />
-      </IconButton>
-    </div>
->>>>>>> a7e29ce (feat: prepare project for cozy-ui migration)
   );
 }