fix the merge conflict
fix the merge conflict

tao-zeng/riot,chetanism/riot,xieyu33333/riot,daemonchen/riotjs,scalabl3/riot,sylvainpolletvillard/riot,txchen/riotjs,dp-lewis/riot,laomu1988/riot,madlordory/riot,ListnPlay/riotjs,marciojcoelho/riotjs,xieyu33333/riot,marcioj/riot,stonexer/riot,muut/riotjs,seedtigo/riot,beni55/riot,txchen/riotjs,crisward/riot,laomu1988/riot,AndrewSwerlick/riot,duongphuhiep/riot,joshcartme/riot,dp-lewis/riot,mike-ward/riot,zawsx/js-lib-webcomponents-react-riot,antonheryanto/riot,rthbound/riot,rasata/riot,AndrewSwerlick/riot,baysao/riot,sylvainpolletvillard/riot,noodle-learns-programming/riot,madlordory/riot,stonexer/riot,a-moses/riot,duongphuhiep/riot,muut/riotjs,qrb/riotjs,antonheryanto/riot,rthbound/riot,crisward/riot,marciojcoelho/riotjs,seedtigo/riot,chetanism/riot,davidmarkclements/riot,dschnare/riot,xtity/riot,baysao/riot,marcioj/riot,a-moses/riot,mike-ward/riot,scalabl3/riot,joshcartme/riot,rasata/riot,daemonchen/riotjs,ListnPlay/riotjs,qrb/riotjs,thepian/riot,noodle-learns-programming/riot,beni55/riot,thepian/riot,zawsx/js-lib-webcomponents-react-riot,tao-zeng/riot,davidmarkclements/riot,xtity/riot,dschnare/riot