  from thinc.neural.ops import CupyOps
  from thinc.neural.util import get_array_module
  from thinc.linalg cimport Vec, VecVec
  
  from .._ml import zero_init, PrecomputableAffine, Tok2Vec, flatten
  from .._ml import link_vectors_to_models, create_default_optimizer
  from ..compat import json_dumps, copy_array
  from ..tokens.doc cimport Doc
 
</s> remove from ..tokens.doc cimport Doc
 </s> add from ..tokens.doc cimport Doc, set_children_from_heads </s> remove from .pipeline import merge_noun_chunks, merge_entities
 </s> add from .pipeline import merge_noun_chunks, merge_entities, merge_subtokens </s> remove 
 </s> add from .tokens.doc cimport Doc
from .tokens.doc cimport get_token_attr
from .attrs cimport ID, attr_id_t, NULL_ATTR </s> remove from collections import OrderedDict
 </s> add from collections import OrderedDict, defaultdict, Counter </s> remove from collections import OrderedDict
 </s> add from collections import OrderedDict, Counter
from thinc cimport openblas

  from thinc.neural.ops import CupyOps
  from thinc.neural.util import get_array_module
  from thinc.linalg cimport Vec, VecVec
from thinc cimport openblas

  
  from .._ml import zero_init, PrecomputableAffine, Tok2Vec, flatten
  from .._ml import link_vectors_to_models, create_default_optimizer
  from ..compat import json_dumps, copy_array
  from ..tokens.doc cimport Doc
keep keep add keep keep keep keep keep
 Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop"

This reverts commit c9ba3d3c2dc7067cf8bd55f878cec45a8c6d73d4, reversing
changes made to 92c26a35d425d4e8ca1b805ea776ea10f5ded3df. 
spacy/syntax/nn_parser.pyx