diff --git a/sources/mainTest/maintest.c b/sources/mainTest/maintest.c
index f03a5dc..ef1c3e1 100644
--- a/sources/mainTest/maintest.c
+++ b/sources/mainTest/maintest.c
@@ -160,11 +160,7 @@ int main( int argc, char *argv[] ){
 	// insérer code GTK ici
         GtkBuilder *monBuilder;
 	GtkWidget *maFenetre;
-<<<<<<< HEAD
-	char *str = NULL;
-=======
 	char *str=NULL;
->>>>>>> 558938498b5f31ae16de379239153824be76559a
 
 	gtk_init( &argc, &argv );
 
@@ -176,10 +172,6 @@ int main( int argc, char *argv[] ){
 	maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetreprincipale"));
 
 	GtkLabel *labelNote = (GtkLabel*) gtk_builder_get_object(monBuilder,"button16");
-<<<<<<< HEAD
-	if (getNote(m,0,0)==0) str="Do";
-	else if (getNote(m,0,0)==1) str="Re";
-=======
 	switch (getNote(m,0,0)) {
 	case 0 :
 	  str="Do ";
@@ -304,7 +296,6 @@ int main( int argc, char *argv[] ){
 	  break;
 	}
 
->>>>>>> 558938498b5f31ae16de379239153824be76559a
 	gtk_label_set_text(labelNote, str);
 
 	gtk_widget_show_all (maFenetre);