conflict boardconfigcommon.mk