Fix merge conflicts in es-419
Fix merge conflicts in es-419

differentmatt/codecombat,nimda7/codecombat,jeremyprice/codecombat,codecombat/codecombat,nimda7/codecombat,MonkStrom/codecombat,khoa102/codecombat,Zacharias030/codecombat,laituan245/codecombat,VilkkuV/codecombat,zhangxiuquan/codecombat,Fokusnica/codecombat,javatlacati/codecombat,Zerrien/codecombat,khoa102/codecombat,jacobakkerboom/codecombat,wgsu/codecombat,laituan245/codecombat,weevilgenius/codecombat,Zerrien/codecombat,nimda7/codecombat,icodegame/codecombat,Driphter/codecombat,duybkict/codecombat,differentmatt/codecombat,differentmatt/codecombat,MonkStrom/codecombat,bsmr-x-script/codecombat,edtrist/codecombat,icodegame/codecombat,javatlacati/codecombat,weevilgenius/codecombat,fabichoi/codecombat,codecombat/codecombat,jeremiahyan/codecombat,JordanLittell/codecombat,VilkkuV/codecombat,nimda7/codecombat,jeremiahyan/codecombat,duybkict/codecombat,fabichoi/codecombat,edtrist/codecombat,Driphter/codecombat,jeremiahyan/codecombat,edtrist/codecombat,UltCombo/codecombat,bsmr-x-script/codecombat,duybkict/codecombat,jhoon/codecombat,weevilgenius/codecombat,weevilgenius/codecombat,tpai/codecombat,Zerrien/codecombat,aashaka/codecombat,javatlacati/codecombat,Driphter/codecombat,UltCombo/codecombat,AkaKaras/codecombat,tpai/codecombat,probil/codecombat,tpai/codecombat,jacobakkerboom/codecombat,wgsu/codecombat,zhangxiuquan/codecombat,edtrist/codecombat,aashaka/codecombat,kidaa/codecombat,codecombat/codecombat,javatlacati/codecombat,probil/codecombat,aashaka/codecombat,jacobakkerboom/codecombat,kidaa/codecombat,zhangxiuquan/codecombat,Fokusnica/codecombat,bsmr-x-script/codecombat,bsmr-x-script/codecombat,Fokusnica/codecombat,jeremyprice/codecombat,kidaa/codecombat,laituan245/codecombat,Driphter/codecombat,jacobakkerboom/codecombat,probil/codecombat,Zerrien/codecombat,differentmatt/codecombat,Minhir/codecombat,AkaKaras/codecombat,zhangxiuquan/codecombat,duybkict/codecombat,icodegame/codecombat,AkaKaras/codecombat,Minhir/codecombat,khoa102/codecombat,JordanLittell/codecombat,tpai/codecombat,MonkStrom/codecombat,jeremyprice/codecombat,jhoon/codecombat,Zacharias030/codecombat,javatlacati/codecombat,jhoon/codecombat,Zacharias030/codecombat,UltCombo/codecombat,aashaka/codecombat,jeremyprice/codecombat,JordanLittell/codecombat,Minhir/codecombat,kidaa/codecombat,probil/codecombat,icodegame/codecombat,wgsu/codecombat,Fokusnica/codecombat,codecombat/codecombat,fabichoi/codecombat,VilkkuV/codecombat,VilkkuV/codecombat,codecombat/codecombat,jeremiahyan/codecombat,wgsu/codecombat,laituan245/codecombat,JordanLittell/codecombat,Minhir/codecombat,jhoon/codecombat,Zacharias030/codecombat,khoa102/codecombat,AkaKaras/codecombat,MonkStrom/codecombat,UltCombo/codecombat,fabichoi/codecombat