[v9.x staging] merge conflicts in util.js

[devsnek]

@MylesBorins

https://github.com/nodejs/node/blob/v9.x-staging/lib/util.js#L437 and https://github.com/nodejs/node/blob/v9.x-staging/lib/util.js#L617

culprit is d7f01bf

[estrada9166]

There are also other lines with the same issue in the same file

• https://github.com/nodejs/node/blob/v9.x-staging/lib/util.js#L826
• https://github.com/nodejs/node/blob/v9.x-staging/lib/util.js#L897

[devsnek]

seems like this was quietly fixed by someone, i'll close