fixed merge typo in setup.py