diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py
index b8363c3..5165f9a 100644
--- a/tests/storage/__init__.py
+++ b/tests/storage/__init__.py
@@ -107,7 +107,7 @@ class StorageTests(object):
         assert not list(s.list())
         s.upload(self._create_bogus_item())
         assert list(s.list())
- 
+
     def test_discover(self):
         collections = set()
 
diff --git a/vdirsyncer/storage/http.py b/vdirsyncer/storage/http.py
index a473028..9cc51c5 100644
--- a/vdirsyncer/storage/http.py
+++ b/vdirsyncer/storage/http.py
@@ -7,8 +7,6 @@
     :license: MIT, see LICENSE for more details.
 '''
 
-import hashlib
-
 from .base import Item, Storage
 from ..utils import expand_path, get_password, request, text_type, urlparse
 
diff --git a/vdirsyncer/sync.py b/vdirsyncer/sync.py
index 225235d..b2de7c4 100644
--- a/vdirsyncer/sync.py
+++ b/vdirsyncer/sync.py
@@ -195,10 +195,12 @@ def action_conflict_resolve(ident):
             raise SyncConflict()
         elif conflict_resolution == 'a wins':
             sync_logger.info('...{} wins.'.format(a_storage))
-            action_update(ident, 'a', 'b')(storages, status, conflict_resolution)
+            action_update(ident, 'a', 'b')(storages, status,
+                                           conflict_resolution)
         elif conflict_resolution == 'b wins':
             sync_logger.info('...{} wins.'.format(b_storage))
-            action_update(ident, 'b', 'a')(storages, status, conflict_resolution)
+            action_update(ident, 'b', 'a')(storages, status,
+                                           conflict_resolution)
         else:
             raise ValueError('Invalid conflict resolution mode: {}'
                              .format(conflict_resolution))