Fix missed merge error