Fixed merge fail
Color class is not used anymore, since it was problematic during merges