made changes to user.js
fixed conflict