color palette fix
merge
merge