fix merge conflict and Add Washington grade level knots and bounds for E...

...OCT subjects