diff --git a/.gitignore b/.gitignore
index 227e8f667e88b89cc8186b5d38b49a2f0e506b31..9575e8f6c3de34e8770941f6b15c707934dada83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,39 +2,10 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
-.idea
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
+.idea/
+.classpath
+.project
+.settings/*
 
 # CMake
 cmake-build-*/
@@ -70,6 +41,6 @@ fabric.properties
 .idea/caches/build_file_checksums.ser
 
 
-/bin/
-/.gradle/
-/build/
+bin/
+.gradle/
+build/
diff --git a/README.md b/README.md
index 674a5ee3cdd44322f7ef98cde352a3fa844e2127..38d4082d44764bb515a47e3fe50fb6b27f68a52c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Simulateur d'ascenseur
-=======
-# ELEVATOR-CORRECTION
->>>>>>> d5629ef1ce17a21a223e99e47aa887ea27c1501d
 
 ## Description du projet 
 
diff --git a/src/test/java/elevator/TestAutomaticElevator.java b/src/test/java/elevator/TestAutomaticElevator.java
index f618cf596bc3f7f372c2fea3ff6d905519e1418d..85e4eb41d3ceb1b2e92efec1ca09413a01b52dec 100644
--- a/src/test/java/elevator/TestAutomaticElevator.java
+++ b/src/test/java/elevator/TestAutomaticElevator.java
@@ -23,7 +23,7 @@ public class TestAutomaticElevator {
 
 		// l'ascenseur est au 4ème
 		assertEquals(3.0, e.getLevel());
-		// l'ascenseur est à l'arret
+		// l'ascenseur est à l'arrêt
 		assertEquals(ERROR, e.getState());
 		// les étapes
 //		assertEquals("à déterminer", e.getEvents());