Resolved small merge issue
Resolved small merge issue

edtrist/codecombat,codecombat/codecombat,codecombat/codecombat,Minhir/codecombat,weevilgenius/codecombat,MonkStrom/codecombat,fabichoi/codecombat,differentmatt/codecombat,VilkkuV/codecombat,kidaa/codecombat,Zerrien/codecombat,differentmatt/codecombat,khoa102/codecombat,fabichoi/codecombat,aashaka/codecombat,edtrist/codecombat,nimda7/codecombat,tpai/codecombat,jeremiahyan/codecombat,icodegame/codecombat,aashaka/codecombat,UltCombo/codecombat,codecombat/codecombat,jeremyprice/codecombat,Minhir/codecombat,bsmr-x-script/codecombat,kidaa/codecombat,fabichoi/codecombat,duybkict/codecombat,aashaka/codecombat,bsmr-x-script/codecombat,duybkict/codecombat,icodegame/codecombat,khoa102/codecombat,bsmr-x-script/codecombat,Minhir/codecombat,fabichoi/codecombat,javatlacati/codecombat,probil/codecombat,kidaa/codecombat,jacobakkerboom/codecombat,jeremyprice/codecombat,khoa102/codecombat,Minhir/codecombat,codecombat/codecombat,zhangxiuquan/codecombat,VilkkuV/codecombat,zhangxiuquan/codecombat,nimda7/codecombat,probil/codecombat,differentmatt/codecombat,differentmatt/codecombat,Zerrien/codecombat,weevilgenius/codecombat,probil/codecombat,khoa102/codecombat,MonkStrom/codecombat,icodegame/codecombat,probil/codecombat,VilkkuV/codecombat,javatlacati/codecombat,javatlacati/codecombat,edtrist/codecombat,jeremiahyan/codecombat,jeremiahyan/codecombat,Zerrien/codecombat,MonkStrom/codecombat,edtrist/codecombat,icodegame/codecombat,jacobakkerboom/codecombat,javatlacati/codecombat,jacobakkerboom/codecombat,jeremyprice/codecombat,jeremyprice/codecombat,weevilgenius/codecombat,bsmr-x-script/codecombat,duybkict/codecombat,tpai/codecombat,duybkict/codecombat,nimda7/codecombat,UltCombo/codecombat,Zerrien/codecombat,jeremiahyan/codecombat,kidaa/codecombat,codecombat/codecombat,tpai/codecombat,javatlacati/codecombat,UltCombo/codecombat,VilkkuV/codecombat,weevilgenius/codecombat,tpai/codecombat,UltCombo/codecombat,MonkStrom/codecombat,zhangxiuquan/codecombat,aashaka/codecombat,jacobakkerboom/codecombat,zhangxiuquan/codecombat,nimda7/codecombat