fix conflict

src/backend/Piece.java

@@ -1,13 +1,21 @@
 package backend;
 
 public class Piece {
+	
+	private int x;
+	private int y;
+	
+	public Piece(int xP, int yP) {
+		x = xP;
+		y = yP;
+	}
 
 	public int getX() {
-		return 0;
+		return x;
 	}
 
 	public int getY() {
-		return 0;
+		return y;
 	}
 	
 	public PieceType getType() {