  
  import ujson
  
  from .syntax import nonproj
  from .tokens import Doc
  from . import util
  from .util import minibatch, itershuffle
  from .compat import json_dumps
 
</s> remove from .util import minibatch
 </s> add from .util import minibatch, itershuffle
from .compat import json_dumps </s> remove import ujson
 </s> add  </s> remove from ..gold import GoldCorpus, minibatch
from ..util import prints
 </s> add from ..gold import GoldCorpus
from ..util import prints, minibatch, minibatch_by_words </s> remove from .pipeline import merge_noun_chunks, merge_entities
 </s> add from .pipeline import merge_noun_chunks, merge_entities, merge_subtokens
from . import _align 
  
  import ujson
  
from . import _align 
  from .syntax import nonproj
  from .tokens import Doc
  from . import util
  from .util import minibatch, itershuffle
  from .compat import json_dumps
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/gold.pyx