diff --git a/bob_party/src/core/conversation.ts b/bob_party/src/core/conversation.ts
index 524b70e..522e866 100644
--- a/bob_party/src/core/conversation.ts
+++ b/bob_party/src/core/conversation.ts
@@ -21,10 +21,6 @@ export class Conversation{
     }
 
     /* Brief : function returning the users of a conversation */
-<<<<<<< HEAD
-=======
-
->>>>>>> fe24058f3896c88fae68bff0b08ab4cb8b61ca2e
     getTabUser(){
         return this.tabUser;
     }
@@ -42,18 +38,10 @@ export class Conversation{
 
     /* Brief : function returning the name to a conversation */
     getName(){
-<<<<<<< HEAD
-=======
-
->>>>>>> fe24058f3896c88fae68bff0b08ab4cb8b61ca2e
         return this.name;
     }
 
     /* Brief : function setting the name to a conversation */
-<<<<<<< HEAD
-=======
-
->>>>>>> fe24058f3896c88fae68bff0b08ab4cb8b61ca2e
     setName(name:string){
         this.name=name;
     }