Fix setup.py file; Remove the additional files while fixing merge conflicts