default push settigs
virtualenv function
fix merge conflicts