fixed missed merge conflict