fix on gray scale convert
fix on merge