conflict merge from color adjustment