#package.json merge=ours