tweaking based on merge