diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 1992e5c..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "files.associations": {
-        "unistd.h": "c"
-    }
-}
\ No newline at end of file
diff --git a/pendu b/pendu
deleted file mode 100755
index e9aae90..0000000
Binary files a/pendu and /dev/null differ
diff --git a/pendu.c b/pendu.c
index c617115..d00d9c6 100644
--- a/pendu.c
+++ b/pendu.c
@@ -37,6 +37,7 @@ void display_hangman(int tries) {
     }
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 /*
 this function allow to save the last party
@@ -82,6 +83,15 @@ void sig_handler(int signum){
     printf("\ntime out\n");
     exit (1);
 >>>>>>> b4f25a5 (ajout du cooldown sur le scanf)
+=======
+/* this function display time out when user does nothing during 30s and verify signal*/
+void sig_handler(int signum){
+    if (signum == SIGALRM){
+
+        printf("\ntime out\n");
+        exit (1);
+    }
+>>>>>>> 83066e1 (ajout des commentaires.)
 }
 
 int main() {