add colors
merge