resolve setup.py after previous merge