fixed missed merge