fix merge conflict
fix merge conflict

RickCarlino/volt,merongivian/volt,Gaelan/volt,sinventor/volt,mzdunek93/volt,nightweb/volt,jfahrer/volt,merongivian/volt,CollaboTree/volt,ahnbizcad/volt,sinventor/volt,matthew342/volt,gabrielrios/volt,ASnow/volt,dummey/volt,Gaelan/volt,dummey/volt,nightweb/volt,askl56/volt,CollaboTree/volt,alexandred/volt,merongivian/volt,thyagobr/volt,RickCarlino/volt,thyagobr/volt,voltrb/volt,voltrb/volt,matthew342/volt,gabrielrios/volt,voltrb/volt,ahnbizcad/volt,thyagobr/volt,CollaboTree/volt,Gaelan/volt,orbitalimpact/crystal-meth,alexandred/volt,jfahrer/volt,jfahrer/volt,matthew342/volt,ASnow/volt,sinventor/volt,alexandred/volt,mzdunek93/volt,gabrielrios/volt,orbitalimpact/crystal-meth,RickCarlino/volt,nightweb/volt,askl56/volt,askl56/volt,mzdunek93/volt,orbitalimpact/crystal-meth,dummey/volt,ASnow/volt,ahnbizcad/volt