updated Gemfile.lock and users_controller
resolved conflict issues
fixed merge conflict