improve naming of merge flavors