diff --git a/Code-C/queue.h b/Code-C/queue.h
index ca20edb..c31f2ad 100644
--- a/Code-C/queue.h
+++ b/Code-C/queue.h
@@ -10,15 +10,10 @@ Pqueue getNextE(Pqueue elem);
 char * gettabChar(Pqueue elem);
 
 //Setters
-<<<<<<< HEAD
-Pqueue setCharLen(Pqueue elem , int _charLen);
-Pqueue setTabChar(Pqueue elem , int _charLen, const char *_tabChar);
-=======
 void setCharLen(Pqueue elem , int _charLen);
 void setTabChar(Pqueue elem , int _charLen , char *_tabChar);
 void setNextE(Pqueue elem , Pqueue next);
 
->>>>>>> 2e7253c43c8e65a98686582d853147831016103f
 Pqueue addLastQ(Pqueue elem, const char* str, int len);
 
 //Removers