fix merge issue with version numbers.