rough colors
color
merge conflics and other things