  from .tokens.doc cimport Doc, get_token_attr
  from .vocab cimport Vocab
  
  from .attrs import IDS
  from .attrs cimport attr_id_t, ID, NULL_ATTR
  from .attrs import FLAG61 as U_ENT
  from .attrs import FLAG60 as B2_ENT
  from .attrs import FLAG59 as B3_ENT
  from .attrs import FLAG58 as B4_ENT
  from .attrs import FLAG57 as B5_ENT
 
</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 .tokens.doc cimport Doc, get_token_attr
 </s> add from .lexeme cimport attr_id_t </s> remove from libc.stdint cimport int32_t

from .typedefs cimport attr_t
from .typedefs cimport hash_t
 </s> add from .typedefs cimport attr_t, hash_t </s> remove cpdef enum quantifier_t:
    _META
    ONE
 </s> add cdef enum action_t:
    REJECT = 0000
    MATCH = 1000
    ADVANCE = 0100
    RETRY = 0010
    RETRY_EXTEND = 0011
    MATCH_EXTEND = 1001
    MATCH_REJECT = 2000


cdef enum quantifier_t: </s> remove from .pipeline import merge_noun_chunks, merge_entities
 </s> add from .pipeline import merge_noun_chunks, merge_entities, merge_subtokens
  from .tokens.doc cimport Doc, get_token_attr
  from .vocab cimport Vocab
  
  from .attrs import IDS

  from .attrs import FLAG61 as U_ENT
  from .attrs import FLAG60 as B2_ENT
  from .attrs import FLAG59 as B3_ENT
  from .attrs import FLAG58 as B4_ENT
  from .attrs import FLAG57 as B5_ENT
keep keep keep keep replace 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/matcher.pyx