Remove git conflict output from setup.py