update 1.js file
update 1.js file and resolv conflict