diff --git a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts
index 64f375f..41294c8 100644
--- a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts
+++ b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts
@@ -52,10 +52,7 @@ export class DialogBoxComponent implements OnInit {
   ngOnInit() {
     let userrole = localStorage.getItem('user_role')
     this.form = new FormGroup({
-<<<<<<< HEAD
     // admin_checked: new FormControl('', [Validators.required]),
-=======
->>>>>>> 5e070331f6649997b43c7352c795079cb50571cf
     // workingHrsJson: new FormControl('', [Validators.required]),
     logo: new FormControl('', null),
     busName: new FormControl('', [Validators.required, Validators.maxLength(20)]),