done with coloring
Conflicts fixed