fixing merge conflicts in setup.py