Fixed rebase conflicts

src/pages/Activities/AttendancePage.jsx

@@ -43,23 +43,6 @@ const AttendancePage = () => {
     description: "",
     date: new Date().toLocaleDateString(),
   });
-  const handler = useCallback(
-    (msg) => {
-      if (selectedProject == msg.projectId) {
-        const updatedAttendance = attendances.map((item) =>
-          item.employeeId === msg.response.employeeId
-            ? { ...item, ...msg.response }
-            : item
-        );
-        cacheData("Attendance", {
-          data: updatedAttendance,
-          projectId: selectedProject,
-        });
-        setAttendances(updatedAttendance);
-      }
-    },
-    [selectedProject,attendances]
-  );
 
   const handler = useCallback(
     (msg) => {