Fix merge error in board.h