diff --git a/spacy/__init__.py b/spacy/__init__.py
index 25af17361..ba2479106 100644
--- a/spacy/__init__.py
+++ b/spacy/__init__.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 from .cli.info import info as cli_info
 from .glossary import explain
-<<<<<<< HEAD
 from .deprecated import resolve_load_name
 #from .about import __version__
 from .about import __version__