Resolve silly conflict in setup.py