fix the version post-merge