Fix missed conflict