diff --git a/setup.py b/setup.py
index 3f1dbf2..74efee9 100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
@@ -96,7 +97,6 @@
         'Topic :: Security :: Cryptography',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: System :: Networking',
-<<<<<<< HEAD
     ],
 
     packages=['OpenSSL'],
@@ -126,14 +126,3 @@
         "test": PyTest,
     }
 )
-=======
-        ],
-      test_suite="OpenSSL",
-      tests_require=[
-          "pytest",
-      ],
-      cmdclass={
-          "test": PyTest,
-      })
-
->>>>>>> switch to SSL_get_version.