diff --git a/snake/fenetre.c b/snake/fenetre.c
index a5777c7..6bed56d 100755
--- a/snake/fenetre.c
+++ b/snake/fenetre.c
@@ -16,10 +16,7 @@ int start (void)  {
   int** tableau = plateau_init();
 
   int i, j;
-<<<<<<< HEAD
 
-=======
->>>>>>> f209244 (mise à jour)
   
   char* texte1 = "espace = lancer";
   
diff --git a/snake/lancement b/snake/lancement
deleted file mode 100755
index 5d0f5bd..0000000
Binary files a/snake/lancement and /dev/null differ