diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index fbbd0d90894..b8865f4e11c 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -38,11 +38,7 @@
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-<<<<<<< HEAD
 version_info = (5, 0, 0, 'final', 0)
-=======
-version_info = (4, 4, 0, 'beta', 0)
->>>>>>> 4.x
 
 package_dir = path.abspath(path.dirname(__file__))