Merge some errors and coloring