color scheme
Fixed merge conflict