Some colors, and my diffmerge