# Conflicts: # Source/Editor/GUI/Dialogs/ColorPickerDialog.cs # Source/Editor/GUI/Dialogs/ColorSelector.cs