Fixed syntax errors in GameBoard.
Fixed merge conflicts.