fix colors from failed merge