Fixed merge conflicts. Added styling in setup.py