Resolve conflict in components.__init__
Resolve conflict in components.__init__

Now correct

amandersillinois/landlab,laijingtao/landlab,amandersillinois/landlab,cmshobe/landlab,ManuSchmi88/landlab,RondaStrauch/landlab,landlab/landlab,landlab/landlab,Carralex/landlab,RondaStrauch/landlab,csherwood-usgs/landlab,SiccarPoint/landlab,landlab/landlab,cmshobe/landlab,cmshobe/landlab,laijingtao/landlab,ManuSchmi88/landlab,SiccarPoint/landlab,Carralex/landlab,Carralex/landlab,csherwood-usgs/landlab,RondaStrauch/landlab,ManuSchmi88/landlab