fixed nametest shift/reduce conflicts