manifest.json merge=ours
common/env.js merge=ours