Fixed incorrect git merge on blockly_webserver