finally got the color to change
fixed merge conflicts