diff --git a/OOP_2B1_Project/src/backend/Move.java b/OOP_2B1_Project/src/backend/Move.java
index 1893e66..37ca6b8 100644
--- a/OOP_2B1_Project/src/backend/Move.java
+++ b/OOP_2B1_Project/src/backend/Move.java
@@ -7,7 +7,7 @@ public class Move {
  * 
  */
 	
-<<<<<<< HEAD
+
 	
 	
 	
@@ -16,7 +16,5 @@ public class Move {
 	
 //En passant method
 	
-=======
 
->>>>>>> branch 'main' of https://gitarero.ecam.fr/romain.murphy/OOP_2B1_Project.git
 }