modify color settings
resolve conflicts