fix identifier lookup regression on merge