diff --git a/src/backend/Board.java b/src/backend/Board.java
index f91f993..55071a5 100644
--- a/src/backend/Board.java
+++ b/src/backend/Board.java
@@ -43,9 +43,7 @@ public class Board {
 	}
 
 	public void populateBoard() {
-
-		/*  // Place Rooks
-=======
+		
 		/*
 		  // Place Rooks
 >>>>>>> branch 'master' of https://gitarero.ecam.fr/jerome.bedier/OOP_1A6_Project.git
@@ -73,7 +71,6 @@ 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
 		  }*/
 		  } 
 
diff --git a/src/backend/Piece.java b/src/backend/Piece.java
index 5e01ffe..8dfcbbe 100644
--- a/src/backend/Piece.java
+++ b/src/backend/Piece.java
@@ -4,6 +4,7 @@ public class Piece {
 	boolean whitePiece;
 	int x;
 	int y;
+	private PieceType type;
 	
 	public int getX() {
 		return x;
@@ -14,7 +15,7 @@ public class Piece {
 	}
 	
 	public PieceType getType() {
-		return null;
+		return type;
 	}
 	
 	public boolean isWhite() {