diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index 95870b62..787b0799 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -234,11 +234,7 @@ const AttendanceLog = ({
       </div>
       <div
         className="table-responsive text-nowrap"
-<<<<<<< HEAD
         style={{ minHeight: "200px", display: 'flex', alignItems: 'center', justifyContent: 'center' }}
-=======
-        style={{ minHeight: "200px" }}
->>>>>>> f8192ae (Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.)
       >
         {data && data.length > 0 && (
           <table className="table mb-0">
@@ -337,6 +333,7 @@ const AttendanceLog = ({
         )}
         {!loading && !isRefreshing && data.length === 0 && (
          <span className="text-muted">No employee logs</span>
+         <span className="text-muted">No employee logs</span>
         )}
         {/* {error && !loading && !isRefreshing && (
           <tr>