diff --git a/src/backend/Board.java b/src/backend/Board.java
index 416556c..f91f993 100644
--- a/src/backend/Board.java
+++ b/src/backend/Board.java
@@ -43,7 +43,12 @@ public class Board {
 	}
 
 	public void populateBoard() {
+
 		/*  // Place Rooks
+=======
+		/*
+		  // Place Rooks
+>>>>>>> branch 'master' of https://gitarero.ecam.fr/jerome.bedier/OOP_1A6_Project.git
 		  board[0][0] = new Rook(PieceColor.BLACK, new Position(0, 0));
 		  board[0][7] = new Rook(PieceColor.BLACK, new Position(0, 7));
 		  board[7][0] = new Rook(PieceColor.WHITE, new Position(7, 0));
@@ -68,8 +73,11 @@ public class Board {
 		  for (int i = 0; i < 8; i++) {
 		      board[1][i] = new Pawn(PieceColor.BLACK, new Position(1, i));
 		      board[6][i] = new Pawn(PieceColor.WHITE, new Position(6, i));
+<<<<<<< HEAD
 		  }*/
-		}
+		  } 
+
+		
 	
 	public void cleanBoard() {
 		//TODO