Conflicts: mix/AssemblyDebuggerControl.cpp mix/AssemblyDebuggerControl.h mix/CodeEditorExtensionManager.cpp mix/CodeEditorExtensionManager.h mix/ConstantCompilationControl.cpp mix/qml.qrc mix/qml/MainContent.qml mix/qml/main.qml