path fixes and don't abort when we don't want to replace the virtualenv and git repo
merging