update color picker
fix conflict