fix colors
merge