fixed merge conflict in custom.js