diff --git a/src/app/app.component.html b/src/app/app.component.html
index 6833802..0aa81f4 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,6 +1,6 @@
 <!-- <app-header-logo *ngIf="dontShow"></app-header-logo>
 <app-nav-bar *ngIf="dontShow"></app-nav-bar> -->
-<app-search-bar *ngIf="router.url != '/signin'"></app-search-bar>
+<app-header-logo *ngIf="router.url != '/signin'"></app-header-logo>
 <app-nav-bar *ngIf="router.url != '/signin'"></app-nav-bar>
 <router-outlet></router-outlet>
 <app-footer *ngIf="router.url != '/signin'"></app-footer>
diff --git a/src/app/pages/favoris-user/favoris-user.component.ts b/src/app/pages/favoris-user/favoris-user.component.ts
index a23b923..5aa64f1 100644
--- a/src/app/pages/favoris-user/favoris-user.component.ts
+++ b/src/app/pages/favoris-user/favoris-user.component.ts
@@ -14,11 +14,6 @@ export class FavorisUserComponent implements OnInit {
   listRestoFav: any;
 
   constructor(private apiBackService : ApiBackService,private tokenService : TokenService) { 
-
-<<<<<<< HEAD
-=======
-  constructor(private apiBackService : ApiBackService,private tokenService : TokenService) { 
->>>>>>> dev
   }
 
   ngOnInit(): void {
@@ -38,3 +33,4 @@ export class FavorisUserComponent implements OnInit {
   }
 
 }
+