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..46d297732 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
       </ng-container>
   
       <ng-container matColumnDef="isactive">
diff --git a/ng6-seed/src/app/settings/masters/masters.component.html b/ng6-seed/src/app/settings/masters/masters.component.html
index 9b24cc3a0..541e9da76 100644
--- a/ng6-seed/src/app/settings/masters/masters.component.html
+++ b/ng6-seed/src/app/settings/masters/masters.component.html
@@ -22,83 +22,6 @@
                 </mat-form-field>
                 </div>
         </div>
-<<<<<<< HEAD
-        <div *ngIf="masterCtrl.value =='1'">
-                <app-industry_classification-list></app-industry_classification-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='2'">
-                <app-product-list></app-product-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='3'">
-                <app-sub-product-list></app-sub-product-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='4'">
-                <app-branch-list></app-branch-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='5'">
-                <app-city-list></app-city-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='6'">
-                <app-states-list></app-states-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='7'">
-                <app-regions-list></app-regions-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='8'">
-                <app-title-list></app-title-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='9'">
-                <app-relation-ship-list></app-relation-ship-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='10'" >
-                <app-members-occupation-list></app-members-occupation-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='11'">
-                <app-activity-list></app-activity-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='12'">
-                <app-uom-list></app-uom-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='13'">
-                <app-pd-type-list></app-pd-type-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='14'">
-                        <app-pd-allocation-type-list>
-                                </app-pd-allocation-type-list>
-                    
-            </div>
-            <div *ngIf="masterCtrl.value =='15'">
-                        <app-pd-location-approach-list></app-pd-location-approach-list>      
-            </div>
-            <div *ngIf="masterCtrl.value =='17'">
-                        <app-comments-on-locality-list></app-comments-on-locality-list>   
-            </div>
-            <div *ngIf="masterCtrl.value =='18'">
-                <app-customer-behaviour-list></app-customer-behaviour-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='19'">
-                <app-customer-segment-list></app-customer-segment-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='20'">
-                        <app-frequency-list></app-frequency-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='21'">
-                        <app-designation-list></app-designation-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='22'">
-                    <!-- <app-company-list></app-company-list> -->
-                    <app-company></app-company>
-            </div>
-            <div *ngIf="masterCtrl.value =='23'">
-                        <app-lender-hierarchy-list></app-lender-hierarchy-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='26'">
-                        <app-pd-notification-list></app-pd-notification-list>
-            </div>
-            <div *ngIf="masterCtrl.value =='27'">
-                        <app-question-category-list></app-question-category-list>
-            </div>
-=======
     <div *ngIf="masterCtrl.value =='1'">
         <app-industry_classification-list></app-industry_classification-list>
     </div>
@@ -174,7 +97,6 @@
     <div *ngIf="masterCtrl.value =='27'">
                 <app-question-category-list></app-question-category-list>
     </div>
->>>>>>> f40b8b4997c74fe358c25b41f5e1e558c66841ff
     <!--<div *ngIf="masterCtrl.value =='master-25'">
              <app-pd-office-lender-list></app-pd-office-lender-list>
     </div>