changed color
changed color and fixed merge conflict