cleaning user model
updating gemfile
fixing merge conflict