overwrite conflicting changes with those from Haley
overwrite conflicting changes with those from Haley

stiphyMT/plantcv,danforthcenter/plantcv,stiphyMT/plantcv,stiphyMT/plantcv,danforthcenter/plantcv,danforthcenter/plantcv