fixed addPixelColor merge breakage
work till now
merge