fix on merge