diff --git a/src/app/services/token.service.ts b/src/app/services/token.service.ts
index 3a06902..4d376de 100644
--- a/src/app/services/token.service.ts
+++ b/src/app/services/token.service.ts
@@ -33,13 +33,8 @@ export class TokenService {
   }
 
 
-<<<<<<< HEAD
   public destroyToken(tokenKey : string): void { 
     localStorage.removeItem(tokenKey);
     localStorage.removeItem('ROLE');
-=======
-  public destroyToken(token : any) { 
-    localStorage.removeItem(token);
->>>>>>> dev
   }
 }