merge conflict with scripts.js