diff --git a/rascal2/ui/view.py b/rascal2/ui/view.py
index 46d8c58..4485250 100644
--- a/rascal2/ui/view.py
+++ b/rascal2/ui/view.py
@@ -106,9 +106,7 @@ def setupMDI(self):
         # TODO implement user save for layouts, this should default to use saved layout and fallback to tile
         self.mdi.tileSubWindows()
         self.setCentralWidget(self.mdi)
-<<<<<<< HEAD
 
-<<<<<<< HEAD
     def init_settings_and_log(self, save_path: str):
         """Initialise settings and logging for the project.
 
@@ -126,18 +124,3 @@ def init_settings_and_log(self, save_path: str):
 
         log_path.parents[0].mkdir(parents=True, exist_ok=True)
         self.logging = setup_logging(log_path, level=self.settings.log_level)
-=======
-    def createErrorDialog(self, error: Exception):
-        """Produce an error dialog from an Exception.
-
-        Parameters
-        ----------
-        error : Exception
-            The exception passed to the View.
-
-        """
-        dlg = ErrorDialog(error=error, parent=self)
-        dlg.exec()
->>>>>>> c07550b (fixed controls widget on view)
-=======
->>>>>>> 77b4863 (completed working widget)