fixed colors
merged
merge