diff --git a/APL1.1/SAE11_2021/main.c b/APL1.1/SAE11_2021/main.c
index e0e1809..d5a6c7e 100644
--- a/APL1.1/SAE11_2021/main.c
+++ b/APL1.1/SAE11_2021/main.c
@@ -1,16 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <graph.h>
-#include <time.h>
-#include <string.h>
-#include <math.h>
-#include "graph_sup.h"
 
+#include "graph_sup.h"
 #include "taquin.h"
-<<<<<<< HEAD
 #include "menu.h"
-=======
->>>>>>> dbf5cd20576dc4c4a48593bdccdfb0fe959dcf34
 
 int main(int argc, char* argv[]) {
 	InitialiserGraphique();