Fix missed merge conflicts.