merging color fix
merging color fix