fixing rebase merge issue with setup.py