diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 6af7f806b..7876e711e 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -270,12 +270,7 @@
 
                   <div *ngFor="let event of events.value" class="EventListBox"   >
 
-<<<<<<< HEAD
-                    <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) &&  showEventBox(event) ">
-=======
-                    <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)">
->>>>>>> 5de16776a2d0d5cddbb186151ec203ae12509873
+                    <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item hover" (click)="eventClicked(event)">
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/shared/agenda/event-list/event-list.page.scss
index 4c04f8508..0d1e3c664 100644
--- a/src/app/shared/agenda/event-list/event-list.page.scss
+++ b/src/app/shared/agenda/event-list/event-list.page.scss
@@ -1,10 +1,10 @@
 :host{
-  padding: 30px 20px 0 20px !important;
   margin: 0;
 }
 .header-content{
   overflow: auto;
   margin: 0 auto;
+  padding: 30px 20px 0 20px !important;
 }
 .header-icon-left{
   font-size: 33px;
@@ -20,6 +20,8 @@
 }
 
 .main-content{
+  padding: 0px 20px 0 20px !important;
+
   margin-top: 20px;
   .item{
     --inner-padding-end: 0 !important;
@@ -100,4 +102,4 @@
     margin: 0;
     padding: 0;
   }
-}
\ No newline at end of file
+}