Fixed merge issues. Board opens OK.