diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
index 96272fc1b..1ef449d34 100644
--- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
@@ -35,15 +35,9 @@
            <mat-cell *matCellDef="let row; let i = index;"> {{row.serialno}} </mat-cell>
        </ng-container>
 
-<<<<<<< HEAD
       <ng-container matColumnDef="category_name">
-        <mat-header-cell *matHeaderCellDef mat-sort-header> Question Category Name </mat-header-cell>
-        <mat-cell *matCellDef="let row"> {{row.category_name}} </mat-cell>
-=======
-      <ng-container matColumnDef="categroy_name">
         <mat-header-cell *matHeaderCellDef mat-sort-header>  Category  </mat-header-cell>
-        <mat-cell *matCellDef="let row"> {{row.categroy_name}} </mat-cell>
->>>>>>> f40b8b4997c74fe358c25b41f5e1e558c66841ff
+        <mat-cell *matCellDef="let row"> {{row.category_name}} </mat-cell>
       </ng-container>
   
       <ng-container matColumnDef="isactive">