diff --git a/travail_de_groupe/chef_oeuvre/src/fire.c b/travail_de_groupe/chef_oeuvre/src/fire.c
index 971d301c518013c7456e2563ca8121d00e462be8..05377df25658ba4efb2d7e4e818128064ad5f58f 100644
--- a/travail_de_groupe/chef_oeuvre/src/fire.c
+++ b/travail_de_groupe/chef_oeuvre/src/fire.c
@@ -55,7 +55,10 @@ listchainfire_t startFire(listchainfire_t listFire,int numberFire, int mapSize){
             xFire= rand()%mapSize;
 
             yFire= rand()%mapSize;
+<<<<<<< HEAD
             //printf("xf:%d,yf:%d\n",xFire,yFire);
+=======
+>>>>>>> 91e99d9a0e864cf399133d4e59d4d7951d1bbd0a
             fire.x= xFire;
             fire.y= yFire; 
             fire.state=1;
@@ -135,7 +138,6 @@ void travelFire(listchainfire_t listFire){
         //printf("x:%d,y:%d\n",(listTemporary->fire).x,(listTemporary->fire).y);
         listTemporary=listTemporary->next;
     }
-    //freeListFire(listTemporary);
 }
 
 void readFapFromFile(char * filename){
@@ -185,9 +187,6 @@ void nextFire(listchainfire_t listFire){
         else if ((pMedium<=probability)&&(probability<pStrong)){(listTemporary->fire).state=STRONG;}
         else {(listTemporary->fire).state=SPREAD;}
 
-        //printf("%d %d\n", probability, state);
-        //printf("%d %d %d %d\n", pDead, pSparkle, pMedium, pStrong);
-
         listTemporary=listTemporary->next;   
     }
 } 
@@ -197,8 +196,6 @@ listchainfire_t probabilitySpreadFire( listchainfire_t listFire, listchainfire_t
     fire_t fire; 
  
     probability= rand()%4;
-    printf("proba:%d\n", probability);
-    printf("listfire1: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y);
 
     if((probability==0)&&((listTemporary->fire).x+1<MAPSIZE)){fire.state=1;
         fire.x=(listTemporary->fire).x+1;
@@ -220,8 +217,6 @@ listchainfire_t probabilitySpreadFire( listchainfire_t listFire, listchainfire_t
         fire.y=(listTemporary->fire).y;
         listFire=insertAheadFire(fire,listFire);
         }
-    printf("listtemp1: x%d,y%d\n",(listTemporary->fire).x,(listTemporary->fire).y);
-    printf("listfire2: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y);
     return listFire;
 }
 
@@ -232,7 +227,6 @@ listchainfire_t spreadFire (listchainfire_t listFire){
         if ((listTemporary->fire).state==4){
             
             listFire=probabilitySpreadFire(listFire, listTemporary); 
-            printf("listfire ajout: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y);
         }
         listTemporary=listTemporary->next; 
     }
diff --git a/travail_de_groupe/chef_oeuvre/src/main.c b/travail_de_groupe/chef_oeuvre/src/main.c
index 2ce91a51061e2f16521276e0e43cc90a0bfd3a93..71aadadc0fd3ee755877e42fad0e225eb8c4ade0 100644
--- a/travail_de_groupe/chef_oeuvre/src/main.c
+++ b/travail_de_groupe/chef_oeuvre/src/main.c
@@ -10,9 +10,8 @@ int main(){
     readMapFromFile("map.txt");
     readFapFromFile("markov.txt");
     fireList = startFire(fireList,10,MAPSIZE);
-    travelFire(fireList);
-    nextFire(fireList);
     nextFire(fireList);
     nextFire(fireList);
+
     mainLoop();
 } 
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/render.c b/travail_de_groupe/chef_oeuvre/src/render.c
index 95d4c559eeb16f28c3a6bdd8c9e26ea4b3f2a417..21dda84899f4cfd86c268f540535c2c63f2f461a 100644
--- a/travail_de_groupe/chef_oeuvre/src/render.c
+++ b/travail_de_groupe/chef_oeuvre/src/render.c
@@ -385,18 +385,19 @@ void mainLoop(){
         delta = (a - b);
         if (delta > 1000/FPS_TO_GET){
             timer += delta;
-            printf("timer : %d\n", (int)timer%1000);
             b = a;
+<<<<<<< HEAD
             //printf("fps : %f", 1000/delta);
+=======
+>>>>>>> 91e99d9a0e864cf399133d4e59d4d7951d1bbd0a
             switch (gameState){
                 case MENU:
                     drawMenu();
                     break;
                 case GAME:
-                    if ((int)timer % 1000 == 0){
+                    if ((int)timer % 100 == 0){
                         nextFire(fireList);
                         fireList=spreadFire(fireList);
-                        printf("after spread fire : x%d,y%d\n",(fireList->fire).x,(fireList->fire).y);
                     }
                     drawGame();
                     break;