Colors changed
Merged
more merging