Fix conflict between 'utils' and 'image dropdown' merges.
Fix conflict between 'utils' and 'image dropdown' merges.

griffpatch/scratch-blocks,jano42/blockly,nickmain/blockly,picklesrus/blockly,groklearning/blockly,google/blockly,carlosperate/blockly,twodee/blockly,gengshenghong/scratch-blocks,markocelan/blockly-minecraft,markocelan/blockly-minecraft,joshlory/blockly,joshlory/blockly,trodi/blockly,markocelan/blockly-minecraft,groklearning/blockly,jano42/blockly,mark-friedman/blockly,lzairdking/blockly,rachel-fenichel/blockly,twodee/blockly,trodi/blockly,LLK/scratch-blocks,InspectorWidget/blockly,trodi/blockly,hkoi/blockly,lzairdking/blockly,gengshenghong/scratch-blocks,LLK/scratch-blocks,google/blockly-devtools,google/blockly,jano42/blockly,google/blockly-devtools,google/blockly,griffpatch/scratch-blocks,google/blockly,trinketapp/blockly,hkoi/blockly,joshlory/blockly,rachel-fenichel/blockly,rachel-fenichel/blockly,InspectorWidget/blockly,gengshenghong/scratch-blocks,LLK/scratch-blocks,gengshenghong/scratch-blocks,hkoi/blockly,trinketapp/blockly,twodee/blockly,jstnhuang/blockly,mark-friedman/blockly,twodee/blockly,nickmain/blockly,griffpatch/scratch-blocks,InspectorWidget/blockly,picklesrus/blockly,jstnhuang/blockly,rachel-fenichel/blockly,nickmain/blockly,mark-friedman/blockly,markocelan/blockly-minecraft,google/blockly,lzairdking/blockly,mark-friedman/blockly,griffpatch/scratch-blocks,rachel-fenichel/blockly,groklearning/blockly,carlosperate/blockly,jano42/blockly,groklearning/blockly,rachel-fenichel/blockly,lzairdking/blockly,google/blockly,jstnhuang/blockly,griffpatch/scratch-blocks,trinketapp/blockly,twodee/blockly,picklesrus/blockly,mark-friedman/blockly,nickmain/blockly,mark-friedman/blockly,carlosperate/blockly,rachel-fenichel/blockly,twodee/blockly,trodi/blockly,nickmain/blockly,carlosperate/blockly,gengshenghong/scratch-blocks,trinketapp/blockly,google/blockly,LLK/scratch-blocks,jstnhuang/blockly,nickmain/blockly,LLK/scratch-blocks