started working on  cololour select
resolved conflicts: