Fix merge conflicts

nw/gui/__init__.py

@@ -8,9 +8,12 @@ from nw.gui.theme import GuiTheme
 
 # Dialogs
 from nw.gui.dialogs.configeditor import GuiConfigEditor
+from nw.gui.dialogs.docmerge import GuiDocMerge
+from nw.gui.dialogs.docsplit import GuiDocSplit
 from nw.gui.dialogs.export import GuiExport
 from nw.gui.dialogs.itemeditor import GuiItemEditor
 from nw.gui.dialogs.projecteditor import GuiProjectEditor
+from nw.gui.dialogs.projectload import GuiProjectLoad
 from nw.gui.dialogs.sessionlog import GuiSessionLogView
 
 # GUI Elements
@@ -33,9 +36,12 @@ __all__ = [
     "GuiMainStatus",
     "GuiTheme",
     "GuiConfigEditor",
+    "GuiDocMerge",
+    "GuiDocSplit",
     "GuiExport",
     "GuiItemEditor",
     "GuiProjectEditor",
+    "GuiProjectLoad",
     "GuiSessionLogView",
     "GuiDocDetails",
     "GuiDocEditor",