finished color change
merge