# Conflicts: # duilib/Core/GlobalManager.cpp # duilib/Core/GlobalManager.h # duilib/Render/RenderSkia.cpp # ui_components/cef_control/control/cef_control_ui.cpp