resolve merge issue (scripts.js)