Fix merge conflict and Add Washington grade level knots and bounds for EOCT subjects