* Fix merge conflict in test_parse
* Fix merge conflict in test_parse

aikramer2/spaCy,oroszgy/spaCy.hu,raphael0202/spaCy,raphael0202/spaCy,wbwseeker/spaCy,spacy-io/spaCy,Gregory-Howard/spaCy,aikramer2/spaCy,honnibal/spaCy,explosion/spaCy,honnibal/spaCy,explosion/spaCy,spacy-io/spaCy,aikramer2/spaCy,recognai/spaCy,banglakit/spaCy,explosion/spaCy,aikramer2/spaCy,explosion/spaCy,recognai/spaCy,honnibal/spaCy,raphael0202/spaCy,banglakit/spaCy,spacy-io/spaCy,Gregory-Howard/spaCy,raphael0202/spaCy,recognai/spaCy,wbwseeker/spaCy,oroszgy/spaCy.hu,oroszgy/spaCy.hu,banglakit/spaCy,aikramer2/spaCy,spacy-io/spaCy,banglakit/spaCy,recognai/spaCy,wbwseeker/spaCy,explosion/spaCy,banglakit/spaCy,Gregory-Howard/spaCy,spacy-io/spaCy,spacy-io/spaCy,wbwseeker/spaCy,Gregory-Howard/spaCy,explosion/spaCy,Gregory-Howard/spaCy,raphael0202/spaCy,recognai/spaCy,Gregory-Howard/spaCy,oroszgy/spaCy.hu,honnibal/spaCy,recognai/spaCy,wbwseeker/spaCy,raphael0202/spaCy,wbwseeker/spaCy,oroszgy/spaCy.hu,banglakit/spaCy,aikramer2/spaCy,oroszgy/spaCy.hu