diff --git a/MavenChess/MavenChess/.attach_pid35590 b/MavenChess/MavenChess/.attach_pid35590
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/MavenChess/MavenChess/src/main/resources/META-INF/MANIFEST.MF b/MavenChess/MavenChess/src/main/resources/META-INF/MANIFEST.MF
index f6e7232f9ab7d34bc6af85525b056b44d1b42aac..2e1a9d5bc3035c6e93aa6f8dfa888d60cdb54b08 100644
--- a/MavenChess/MavenChess/src/main/resources/META-INF/MANIFEST.MF
+++ b/MavenChess/MavenChess/src/main/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,2 @@
 Manifest-Version: 1.0
-Main-Class: controller.Main
-
+Main-Class: controller.Main
\ No newline at end of file
diff --git a/MavenChess/out/artifacts/MavenChess_jar/MavenChess.jar b/MavenChess/out/artifacts/MavenChess_jar/MavenChess.jar
index e3e184ea2339eec58da6e6b9dced702ec290705e..87cc9288c41792cf9f5207069b000aaaf820a226 100644
Binary files a/MavenChess/out/artifacts/MavenChess_jar/MavenChess.jar and b/MavenChess/out/artifacts/MavenChess_jar/MavenChess.jar differ
diff --git a/README.md b/README.md
index 655e561d0eb277cbb2b704b21972fb6ef8dd47e1..072ece52e84ea3127b449b5fce32ad2601b6b321 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ Ce projet est notre projet de jeu d'échec en java avec le moteur graphique Java
 
 ### Linux
 Lancer le jeu avec la commande
+<<<<<<< HEAD
 
 ```shell
 java -jar <chemin du jar>
@@ -27,6 +28,21 @@ ouvrir PowerShell
 & <chemin de "java.exe" du dossier de l'installation javaFX> -jar <chemin du jar>
 ```
 
+=======
+
+```shell
+java -jar <chemin du jar>
+```
+### Windows
+
+// a toi de finir olivier
+
+
+
+## Contributing
+
+    Quertz, Programmeur fou de neverwinter qui a aidé avec l'exportation et le débugging de l'executable jar.
+>>>>>>> 3730e352b705086344fd960fc3cc93bc482cbb7c
 
 ## Authors and acknowledgment