diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
index 7247ad105..7c7ba2623 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
@@ -16,28 +16,23 @@
               </ng-container>
               <ng-container matColumnDef="Address">
                    <mat-cell  class="cell" *matCellDef="let details;"> 
-                     <span matTooltip="Initiated Date" matTooltipPosition="above">{{details.pd_date_of_initiation}}</span><br>
+                     <span>{{details.pd_date_of_initiation}}</span><br>
                     <span class="fontsize" *ngIf="details.city_name"> <i class="fa-1x fa fa-map-marker"> </i> {{details.city_name}}-{{details.pincode}}  </span> 
                    </mat-cell>
               </ng-container>
               <ng-container matColumnDef="Status">
                   <mat-cell  class="cell center" *matCellDef="let details;"> 
                       <span> {{details.pd_status}}</span><br>
-<<<<<<< HEAD
                       <!-- <span class="fontsize">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
                         </span>  -->
                         <span class="fontsize">{{details.scheduled_on}}
                             </span>
                         
-=======
-                      <span class="fontsize" [matTooltip]="details.pd_status | titlecase" matTooltipPosition="above">{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
-                        </span> 
->>>>>>> d0eab1030bbd496efa69a275ecc67f72ff2121d6
                   </mat-cell>
              </ng-container>
               <ng-container matColumnDef="Action">
                    <mat-cell class="cell center" *matCellDef="let details;">
-                      <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
+                      <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)"><mat-icon>visibility</mat-icon></button>
                   </mat-cell>
               </ng-container>
               <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">