virtual env + pythonrc
Fixup merge conflict