Fix missed merge conflict.