Resolved merge conflict

main.py

@@ -7,7 +7,6 @@ from PySide6.QtCore import QResource
 from lib.ConfigLoader import ConfigLoader
 from lib.DataBase import DataBase
 import rc_pyqcrm
-import rc_qml
 import sqlite3
 
 # [pyqcrm]
@@ -37,18 +36,21 @@ def testConnection():
 
 
 if __name__ == "__main__":
-    # QResource.registerResource("qml.qrc")
+    #QResource.registerResource("rc_qml.py")
     app = QGuiApplication(sys.argv)
     engine = QQmlApplicationEngine()
+
     engine.addImportPath("qrc:/");
 
+
+
     bad_config = False
 
 
 
     qml_file = Path(__file__).resolve().parent / "gui/main.qml"
 
-    # qml_file = ":/gui/TopBar.qml"
+    #qml_file = ":/gui/main.qml"
 
     config = ConfigLoader()