Fix missed merge  error