diff --git a/SimPEG/__init__.py b/SimPEG/__init__.py
index f50e1cef..f4628b6e 100644
--- a/SimPEG/__init__.py
+++ b/SimPEG/__init__.py
@@ -2,10 +2,6 @@ import utils
 from utils import Solver
 import mesh
 import inverse
-<<<<<<< HEAD
-from Solver import Solver
 import visulize
-=======
 import forward
 import regularization
->>>>>>> refs/remotes/origin/master