Fix version number merge.