added color
merge