color_scales updated following the conflict #114

Closed Rajani462 closed 1 year ago