merge_versions bugfix