Changed colors
Merging changes