Update setup.py

Fixing after merge conflict