merged fix_vcs