diff --git a/CDTools/tools/__init__.py b/CDTools/tools/__init__.py
index a8eacbe..6ea3699 100644
--- a/CDTools/tools/__init__.py
+++ b/CDTools/tools/__init__.py
@@ -3,11 +3,8 @@ from __future__ import division, print_function, absolute_import
 from CDTools.tools import cmath
 from CDTools.tools import losses
 from CDTools.tools import data
-<<<<<<< HEAD
 from CDTools.tools import image_processing
 from CDTools.tools import initializers
 from CDTools.tools import losses
 from CDTools.tools import projectors
 from CDTools.tools import propagators
-=======
->>>>>>> bad75422717fd0eecfe1a136fddc2b96828a3321