Fixed merge conflict in board.h before syncing with mainline
Attach a file by drag & drop or click to upload
