started color
fixing merge