adding in new colors
Merging