correct the colors which got messed up during merge