Fixed homepage link in setup.py
Resolved merge conflict