Fixed random colors
Fixed merges