  from thinc.neural._classes.model import Model
  from timeit import default_timer as timer
  
  from ..attrs import PROB, IS_OOV, CLUSTER, LANG
  from ..gold import GoldCorpus, minibatch
  from ..util import prints
  from .. import util
  from .. import about
  from .. import displacy
  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 from .attrs cimport attr_id_t, ID, NULL_ATTR
 </s> add 
from ..gold import GoldCorpus
from ..util import prints, minibatch, minibatch_by_words
  from thinc.neural._classes.model import Model
  from timeit import default_timer as timer
  
  from ..attrs import PROB, IS_OOV, CLUSTER, LANG
from ..gold import GoldCorpus
from ..util import prints, minibatch, minibatch_by_words
from ..gold import GoldCorpus
from ..util import prints, minibatch, minibatch_by_words
  from .. import util
  from .. import about
  from .. import displacy
  from ..compat import json_dumps
  
keep keep keep keep replace 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/cli/train.py