Merge in GameBoardActivity