Fix weird merge
Fix weird merge

codecombat/codecombat,codecombat/codecombat,javatlacati/codecombat,javatlacati/codecombat,javatlacati/codecombat,codecombat/codecombat,codecombat/codecombat,javatlacati/codecombat,javatlacati/codecombat,codecombat/codecombat