Fix missed merge conflicts in release.rst