This resolves a conflict in `blockly_uncompressed.js`, and missing updates to `test/deps.js`, caused by PR #5041.