diff --git a/.gitignore b/.gitignore
index 1f01948..b31642e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,5 @@
 /bin/
 /.idea/
 /.project
-<<<<<<< HEAD
 /.classpath
-=======
 /jeu-de-combat.iml
-/pom.xml
->>>>>>> branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git