add color, test merge