Resolves these conflicts: meteor scripts/dev-bundle-server-package.js scripts/dev-bundle-tool-package.js tools/files.js This requires building a new dev bundle, and moving the wrapCallSite thing to source-map-retriever-stack.js.