fix second merge  errors
fix second merge  errors

mlarghydracept/loomio,codingnutty/loomio,juliagra/DBCloomio,mlarghydracept/loomio,FSFTN/Loomio,loomio/loomio,labhackercd/loomio,aca13jmf/loomio,piratas-ar/loomio,kimihito/loomio,wangjun/loomio,doomergithub/loomio,isomerase/loomio,labhackercd/loomio,HadoDokis/loomio,HadoDokis/loomio,labhackercd/loomio,Collabforge/site-collabio,FSFTN/Loomio,sicambria/loomio,wangjun/loomio,Collabforge/site-collabio,codingnutty/loomio,digideskio/loomio,HadoDokis/loomio,digideskio/loomio,tachyons/loomio,sicambria/loomio,mhjb/loomio,mhjb/loomio,mlarghydracept/loomio,Collabforge/site-collabio,mhjb/loomio,doomergithub/loomio,juliagra/DBCloomio,loomio/loomio,annewchen/loomio,isomerase/loomio,aca13jmf/loomio,gvalerin/loomio,isomerase/loomio,kimihito/loomio,labhackercd/loomio,digideskio/loomio,sicambria/loomio,HadoDokis/loomio,annewchen/loomio,FSFTN/Loomio,loomio/loomio,juliagra/DBCloomio,juliagra/loomio,tachyons/loomio,piratas-ar/loomio,aca13jmf/loomio,doomergithub/loomio,mhjb/loomio,piratas-ar/loomio,FSFTN/Loomio,gvalerin/loomio,kimihito/loomio,sicambria/loomio,wangjun/loomio,annewchen/loomio,tachyons/loomio,loomio/loomio,piratas-ar/loomio,tachyons/loomio,juliagra/loomio,juliagra/loomio,codingnutty/loomio,gvalerin/loomio,isomerase/loomio,Collabforge/site-collabio