gegl-color: fix merge conflict