Is it a bad merge?
patching spark_polymer.html should still be useful.
CWS version does not include the non-precompiled.js