diff --git a/docker/transport/sshconn.py b/docker/transport/sshconn.py
index 7de0e590..57b55c9e 100644
--- a/docker/transport/sshconn.py
+++ b/docker/transport/sshconn.py
@@ -2,7 +2,10 @@ import paramiko
 import requests.adapters
 import six
 import logging
+<<<<<<< HEAD
 import os
+=======
+>>>>>>> 2dc569a... set logging level of paramiko to warn
 
 from docker.transport.basehttpadapter import BaseHTTPAdapter
 from .. import constants