Fixed some conflicts in board.java