Fix the setup.py.  Dammit
resolve conlficts