Updated for boards.h
Corrected merge error.