diff --git a/resources/Maps.txt b/resources/Maps.txt
index 707789f33827b43b93173e1a8815e0a4aae25878..deddaa859e4defdc36153c5c7e9cf63b43ced10a 100644
--- a/resources/Maps.txt
+++ b/resources/Maps.txt
@@ -35,14 +35,14 @@ FFPFMP
 MAP4 16 10
 
 MPPFFPPPFMMPPFFP
-PPFMMPPFFPPPFMMP
-PFFPPPFMMPPFFPPP
-FMMPPFFPPPFMMPPF
-FPPPFMMPPFFPPPFM
-MPPFFPPPEMMPPFFP
-PPFMMEEEFPPPFMMP
-PFFPPPEEMPPFFPPP
-FMMPPFFPPPFMMPPF
+PPFMMPPFPPPPFFFM
+PFFPPPFEPPPFFPPM
+FMMPPFFEEPFFPPPM
+FPPPFFPEEFPFPPFM
+MPPFFPEEMMMPPFFP
+PPFFFFPPFMPPFPPP
+PFFEPPFFPPPFFPPP
+FMEEEFFPPPFMMPPF
 FPPPFMMPPFFPPPFM
 
 
@@ -64,4 +64,3 @@ MPPFFPPPFM
 MPPFFPPPFM
 MPPFFPPPFM
 MPPFFPPPFM
-
diff --git a/resources/Skins/Map_1.bmp b/resources/Skins/Map_1.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..7205bf01e49b5bd13d78d47d002a29e599c93659
Binary files /dev/null and b/resources/Skins/Map_1.bmp differ
diff --git a/resources/Skins/Map_2.bmp b/resources/Skins/Map_2.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..e300abcb4183acae9cb0874744d227b74c3f2e6d
Binary files /dev/null and b/resources/Skins/Map_2.bmp differ
diff --git a/resources/Skins/Map_3.bmp b/resources/Skins/Map_3.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..a6a0c29b43d995ff9c5ebadfa9bd278de9923ade
Binary files /dev/null and b/resources/Skins/Map_3.bmp differ
diff --git a/resources/Skins/Map_4.bmp b/resources/Skins/Map_4.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..de156aeeca1e8512ad3ea2d44c307e736641a50f
Binary files /dev/null and b/resources/Skins/Map_4.bmp differ
diff --git a/resources/Skins/Map_5.bmp b/resources/Skins/Map_5.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..c706f60f5b18413b36df818f2ad4131d6facb369
Binary files /dev/null and b/resources/Skins/Map_5.bmp differ
diff --git a/src/SDL_bis.c b/src/SDL_bis.c
index 7e3d2e11b8f3dcea36100cf89d4d8618d9c92d36..d818c5f98aa09a5a3bbe7bd16a3e003796ab4e59 100644
--- a/src/SDL_bis.c
+++ b/src/SDL_bis.c
@@ -67,15 +67,15 @@ int SDL_bis()
 
     char nom_joueur1[TAILLE_NOMS] = "";
     fgets(nom_joueur1, sizeof(nom_joueur1), stdin);
-<<<<<<< HEAD
+
     char nom_joueur2[15] = "";
    // ajouter_joueurs(nom_joueur1,nom_joueur2, &etat); //a coder par colin
-=======
+
     texte = TTF_RenderText_Shaded(police, "Entrez le nom du joueur 2", couleurBlanche,couleurNoire);
     SDL_BlitSurface(texte,NULL,ecran,&pos_texte);
     SDL_Flip(ecran);
 
-    char nom_joueur2[TAILLE_NOMS] = "";
+    //char nom_joueur2[TAILLE_NOMS] = "";
 
     fgets(nom_joueur2, sizeof(nom_joueur2), stdin);
     ajouterUnJoueur(nom_joueur1,&etat);
@@ -86,7 +86,7 @@ int SDL_bis()
     pos_texte.x=(ecran->w-texte->w)/2;
     pos_texte.y=ecran->h-200;
     rectangle=SDL_CreateRGBSurface(SDL_HWSURFACE,texte->w,texte->h,NULL,0,0,255,NULL);
->>>>>>> 2aeeb25b1ba76ad66d203c7a609516daa79b3569
+
 
     SDL_FillRect(ecran,NULL,SDL_MapRGB(ecran->format,0,0,0));
     SDL_BlitSurface(logo,NULL,ecran,&pos_logo);
diff --git a/src/main.c b/src/main.c
index 81fb3bc63149c6cc304373c94f840c2854e3fd25..7cc72bc4335f2e7273ee284b9b317fd6b5e2e0e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -120,7 +120,7 @@ Pack_A.GUI_Package = GUI_Pack;
     /* -------------------------------------*/
     /* -------------------------------------*/
 
-    //main_SDL(Map_ANCIENNE_VERSION);
+    main_SDL(Map_ANCIENNE_VERSION);
     //SDL_bis();
 
     //Test_Competences();