Fix missed merge