fix bug on merge area