fixed missed merge issue