diff --git a/APL1.1/SAE11_2021/main.c b/APL1.1/SAE11_2021/main.c
index 1d2061c..e0e1809 100644
--- a/APL1.1/SAE11_2021/main.c
+++ b/APL1.1/SAE11_2021/main.c
@@ -7,7 +7,10 @@
 #include "graph_sup.h"
 
 #include "taquin.h"
+<<<<<<< HEAD
 #include "menu.h"
+=======
+>>>>>>> dbf5cd20576dc4c4a48593bdccdfb0fe959dcf34
 
 int main(int argc, char* argv[]) {
 	InitialiserGraphique();
diff --git a/APL1.1/SAE11_2021/menu.h b/APL1.1/SAE11_2021/menu.h
deleted file mode 100644
index 78acc9e..0000000
--- a/APL1.1/SAE11_2021/menu.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MENU_H
-#define _MENU_H
-
-#endif
\ No newline at end of file