              lex.is_oov = False
      for name in pipeline:
          nlp.add_pipe(nlp.create_pipe(name), name=name)
      if parser_multitasks:
          for objective in parser_multitasks.split(','):
              nlp.parser.add_multitask_objective(objective)
      if entity_multitasks:
          for objective in entity_multitasks.split(','):
 
</s> remove                 # Important that the labels be stored as a list! We need the
                # order, or the model goes out of synch
                self.cfg.setdefault('extra_labels', []).append(label)
 </s> add  </s> remove __release__ = True
 </s> add __release__ = False </s> remove             # Check projectivity --- leading cause
            if is_nonproj_tree(gold.heads):
 </s> add             # Check label set --- leading cause
            label_set = set([self.strings[self.c[i].label] for i in range(self.n_moves)])
            for label_str in gold.labels:
                if label_str is not None and label_str not in label_set:
                    raise ValueError("Cannot get gold parser action: unknown label: %s" % label_str)
            # Check projectivity --- other leading cause
            if nonproj.is_nonproj_tree(gold.heads):
    nlp.add_pipe(nlp.create_pipe('merge_subtokens'))
              lex.is_oov = False
      for name in pipeline:
          nlp.add_pipe(nlp.create_pipe(name), name=name)
    nlp.add_pipe(nlp.create_pipe('merge_subtokens'))
      if parser_multitasks:
          for objective in parser_multitasks.split(','):
              nlp.parser.add_multitask_objective(objective)
      if entity_multitasks:
          for objective in entity_multitasks.split(','):
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/cli/train.py