fix red color
merge