removed some git conflict text that was accidentally introduced
removed some git conflict text that was accidentally introduced

lucas-ez/inaturalist,inaturalist/inaturalist,loarie/inaturalist,calonso-conabio/inaturalist,loarie/inaturalist,pleary/inaturalist,inaturalist/inaturalist,inaturalist/inaturalist,lucas-ez/inaturalist,lucas-ez/inaturalist,HotFusionMan/inaturalist,alexshepard/inaturalist,loarie/inaturalist,calonso-conabio/inaturalist,pleary/inaturalist,lucas-ez/inaturalist,pleary/inaturalist,HotFusionMan/inaturalist,alexshepard/inaturalist,loarie/inaturalist,inaturalist/inaturalist,HotFusionMan/inaturalist,calonso-conabio/inaturalist,nzbrn/naturewatch,calonso-conabio/inaturalist,inaturalist/inaturalist,lucas-ez/inaturalist,HotFusionMan/inaturalist,pleary/inaturalist,alexshepard/inaturalist,nzbrn/naturewatch,loarie/inaturalist,nzbrn/naturewatch,alexshepard/inaturalist,pleary/inaturalist,HotFusionMan/inaturalist,calonso-conabio/inaturalist,alexshepard/inaturalist