exec board page getting there
fixing conflicts