diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py
index 8cd7151c..2be829ac 100644
--- a/skimage/data/__init__.py
+++ b/skimage/data/__init__.py
@@ -8,13 +8,8 @@ For more images, see
 
 import os as _os
 
-<<<<<<< HEAD
-from ..io import imread, use_plugin
-from skimage import data_dir
-=======
 from .. import data_dir
-from ..io import imread
->>>>>>> Use relative imports in skimage files
+from ..io import imread, use_plugin
 
 
 __all__ = ['load',