diff --git a/acme/setup.py b/acme/setup.py
index 82a08b6ef..c10c95546 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -10,7 +10,6 @@ version = '0.2.0.dev0'
 install_requires = [
     # load_pem_private/public_key (>=0.6)
     # rsa_recover_prime_factors (>=0.8)
-<<<<<<< HEAD
     'cryptography>=0.8,<1.2',
     # Connection.set_tlsext_host_name (>=0.13)
     'PyOpenSSL>=0.13',