diff --git a/src/pytak/__init__.py b/src/pytak/__init__.py
index c57c77f..ac99d50 100644
--- a/src/pytak/__init__.py
+++ b/src/pytak/__init__.py
@@ -46,12 +46,8 @@
     DEFAULT_COT_VAL,
     DEFAULT_MAX_OUT_QUEUE,
     DEFAULT_MAX_IN_QUEUE,
-<<<<<<< Updated upstream
-    ISO_8601_UTC,
-    DEFAULT_TLS_ENROLLMENT_CERT_PASSPHRASE_LENGTH
-=======
+    DEFAULT_TLS_ENROLLMENT_CERT_PASSPHRASE_LENGTH,
     ISO_8601_UTC
->>>>>>> Stashed changes
 )
 
 from .classes import (  # NOQA