Resolving merge conflict in setup.py