diff --git a/ng-seed/src/app/appoinment/appoinment-routing.module.ts b/ng-seed/src/app/appoinment/appoinment-routing.module.ts
index 12187a1..57f0326 100644
--- a/ng-seed/src/app/appoinment/appoinment-routing.module.ts
+++ b/ng-seed/src/app/appoinment/appoinment-routing.module.ts
@@ -1,14 +1,5 @@
 import { Component, NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-<<<<<<< HEAD
-import { AddBusinessListComponent } from './business/add-business-list/add-business-list.component'; 
-=======
-import { AppoinmentsListComponent } from './appoinments/appoinments-list/appoinments-list.component';
-import { BusinessListComponent } from './business/business-list/business-list.component';
-import { CalendarListComponent } from './calendars/calendar-list/calendar-list.component';
-import { CustomersListComponent } from './customers/customers-list/customers-list.component';
-import { ServiceListComponent } from './service-list-details/service-list/service-list.component';
->>>>>>> ad201609bd8dc2d9a939bf24f4eb3c1b0107e912
 import { UserListComponent } from './user/user-list/user-list.component';
 
 
diff --git a/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts b/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts
index 348596d..6fa7242 100644
--- a/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts
+++ b/ng-seed/src/app/appoinment/business/business-list/business-list.component.ts
@@ -109,13 +109,8 @@ export class BusinessListComponent implements OnInit {
   } 
   openDialog(action,obj) {
     obj.action = action;
-<<<<<<< HEAD
-    const dialogRef = this.dialog.open(DialogBoxComponent, {
-      width: '30%',
-=======
     const dialogRef = this.dialog.open(AddBusinessComponent, {
-      width: '39%',
->>>>>>> ad201609bd8dc2d9a939bf24f4eb3c1b0107e912
+      width: '30%',
       height: '100%',
       // maxWidth: '38vw',
       position: { right: '0' },