diff --git a/travail_individuel/Belkhiri/GameOfLife/run b/travail_individuel/Belkhiri/GameOfLife/run
deleted file mode 100755
index 5091a0fc6309b406237ba71628156f6fa53f0452..0000000000000000000000000000000000000000
Binary files a/travail_individuel/Belkhiri/GameOfLife/run and /dev/null differ
diff --git a/travail_individuel/Belkhiri/GameOfLife/src/map.c b/travail_individuel/Belkhiri/GameOfLife/src/map.c
index 5392bec402a4834dd6a9557872d655545a11ab15..30a49ee806d1e71c952d8fffb9f1408ab6b8ccca 100644
--- a/travail_individuel/Belkhiri/GameOfLife/src/map.c
+++ b/travail_individuel/Belkhiri/GameOfLife/src/map.c
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #include "map.h"
 
 
@@ -33,28 +32,4 @@ void writeMap(int map[MAPSIZE][MAPSIZE], char* filename){
         fprintf(f, "\n");
     }
     fclose(f);
-=======
-#include "map.h"
-
-
-int map[MAPSIZE][MAPSIZE];
-
-
-void initMap(int map[MAPSIZE][MAPSIZE]) {
-    for(int i = 0; i < MAPSIZE; i++){
-        for(int j = 0; j < MAPSIZE; j++){
-            map[i][j] = rand() % 2;
-        }
-    }
-}
-
-
-void printMap(int map[MAPSIZE][MAPSIZE]){
-    for(int i = 0; i < MAPSIZE; i++){
-        for(int j = 0; j < MAPSIZE; j++){
-            printf("%d ", map[i][j]);
-        }
-        printf("\n");
-    }
->>>>>>> 0a3e97f21219b823cdb1f8f8e7efee9633cdcc07
 }
\ No newline at end of file
diff --git a/travail_individuel/Belkhiri/GameOfLife/src/map.h b/travail_individuel/Belkhiri/GameOfLife/src/map.h
index 5394f62ccfb88ebdb998c0d8213aa7efe4989e71..b50040c93b8fa9ebed34986df1a5eaae64590376 100644
--- a/travail_individuel/Belkhiri/GameOfLife/src/map.h
+++ b/travail_individuel/Belkhiri/GameOfLife/src/map.h
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ifndef _MAP_HEADER_
 #define _MAP_HEADER_
 
@@ -11,17 +10,4 @@ void printMap(int map[MAPSIZE][MAPSIZE]);
 void initMap(int map[MAPSIZE][MAPSIZE]);
 void writeMap(int map[MAPSIZE][MAPSIZE], char* filename);
 
-=======
-#ifndef _MAP_HEADER_
-#define _MAP_HEADER_
-
-#include "main.h"
-
-#define MAPSIZE 20
-extern int map[MAPSIZE][MAPSIZE];
-
-void printMap(int map[MAPSIZE][MAPSIZE]);
-void initMap(int map[MAPSIZE][MAPSIZE]);
-
->>>>>>> 0a3e97f21219b823cdb1f8f8e7efee9633cdcc07
 #endif
\ No newline at end of file