bug on merge fixed