fix on merge issue