Resolve merge conflicts for the 1.14 release.