Fix color-lightness merge conflicts