merge conflict resolution for scripts.js