Fix utils.js rebase problems