diff --git a/src/backend/Board.java b/src/backend/Board.java
index 55071a5..b43543e 100644
--- a/src/backend/Board.java
+++ b/src/backend/Board.java
@@ -43,10 +43,8 @@ public class Board {
 	}
 
 	public void populateBoard() {
-		
 		/*
 		  // 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));
@@ -72,7 +70,7 @@ public class Board {
 		      board[1][i] = new Pawn(PieceColor.BLACK, new Position(1, i));
 		      board[6][i] = new Pawn(PieceColor.WHITE, new Position(6, i));
 		  }*/
-		  } 
+	} 
 
 		
 	
diff --git a/src/backend/Piece.java b/src/backend/Piece.java
index 8dfcbbe..038268b 100644
--- a/src/backend/Piece.java
+++ b/src/backend/Piece.java
@@ -19,10 +19,7 @@ public class Piece {
 	}
 	
 	public boolean isWhite() {
-		if (whitePiece) {
-	        return true;
-	    }
-		return false;
+		return whitePiece;
 	}
 	
 }