remove conflict output
Merge pull request #55 from dlapiduz/master

Remove git conflict output from setup.py