attempting to correct merge error