Fix missed merge conflict