diff --git a/pysollib/main.py b/pysollib/main.py
index b4dc8233..0e7b9192 100644
--- a/pysollib/main.py
+++ b/pysollib/main.py
@@ -44,10 +44,7 @@ from pysollib.pysoltk import loadImage
 from pysollib.pysoltk import MfxMessageDialog
 from pysollib.pysoltk import MfxRoot
 from pysollib.pysoltk import PysolProgressBar
-<<<<<<< HEAD
 
-=======
->>>>>>> solver_dialog_remove_so_called_solving_method
 
 # ************************************************************************
 # *