Delete conflict line in harvest.py