diff --git a/src/View/Translate.py b/src/View/Translate.py
index 43317275..82f29b50 100644
--- a/src/View/Translate.py
+++ b/src/View/Translate.py
@@ -282,15 +282,14 @@ class MainTranslate(UnitTranslate):
         self._dict["Cancel"] = _translate("MainWindow", "Cancel")
         self._dict["Save"] = _translate("MainWindow", "Save")
         self._dict["Close"] = _translate("MainWindow", "Close")
-<<<<<<< HEAD
         self._dict["Solver"] = _translate("MainWindow", "Solver")
-=======
 
         self._dict["mb_results_not_found"] = _translate(
             "MainWindow", "Results can not be loaded"
         )
         self._dict["mb_results_folder_not_found"] = _translate(
-            "MainWindow", "Results folder does not correspond to a Pamhyr2 solver"
+            "MainWindow",
+            "Results folder does not correspond to a Pamhyr2 solver name"
         )
         self._dict["mb_results_bin_not_found"] = _translate(
             "MainWindow", "Results binary files not found"
@@ -298,4 +297,3 @@ class MainTranslate(UnitTranslate):
         self._dict["mb_results_total_bin_not_found"] = _translate(
             "MainWindow", "total_sediment.bin file not found"
         )
->>>>>>> 3bbc55b (add a warning window when opening Adis-TS results from file if wrong directory)